diff -Nru windows-el-2.48/debian/changelog windows-el-2.55/debian/changelog --- windows-el-2.48/debian/changelog 2020-07-22 07:08:27.000000000 +0000 +++ windows-el-2.55/debian/changelog 2020-07-21 18:28:02.000000000 +0000 @@ -1,3 +1,17 @@ +windows-el (2.55-1) unstable; urgency=medium + + * New upstream version. + * debian/control: + * Bump debhelper compat. (Closes: #965874) + * Bump standards version. + * Add homepage field. + * Don't specify emacs version. + * debian/copyright: + * Now 2-clause BSD licensed. + * Switch to machine-readable format. + + -- Hubert Chathi Tue, 21 Jul 2020 14:28:02 -0400 + windows-el (2.48-3) unstable; urgency=low * debian/emacsen-install: don't copy el files, just (forcibly) symlink diff -Nru windows-el-2.48/debian/compat windows-el-2.55/debian/compat --- windows-el-2.48/debian/compat 2020-07-22 07:08:27.000000000 +0000 +++ windows-el-2.55/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -5 diff -Nru windows-el-2.48/debian/control windows-el-2.55/debian/control --- windows-el-2.48/debian/control 2020-07-22 07:08:27.000000000 +0000 +++ windows-el-2.55/debian/control 2020-07-21 18:28:02.000000000 +0000 @@ -2,12 +2,13 @@ Section: utils Priority: optional Maintainer: Hubert Chathi -Standards-Version: 3.7.3 -Build-Depends: debhelper (>= 5) +Standards-Version: 4.5.0 +Build-Depends: debhelper-compat (= 12) +Homepage: https://www.gentei.org/~yuuji/software/ Package: windows-el Architecture: all -Depends: emacs24|emacsen +Depends: emacs|emacsen, ${misc:Depends} Description: window manager for GNU Emacs windows.el allows you to switch between window configurations in emacs, providing behaviour similar to virtual desktops that is common in several diff -Nru windows-el-2.48/debian/copyright windows-el-2.55/debian/copyright --- windows-el-2.48/debian/copyright 2020-07-22 07:08:27.000000000 +0000 +++ windows-el-2.55/debian/copyright 2020-07-21 18:28:02.000000000 +0000 @@ -1,42 +1,35 @@ -This package was debianized by Takao KAWAMURA kawamura@debian.org on -Thu, 26 Aug 1999 17:39:15 +0900. - -The current Debian maintainer is Hubert Chan . - -It was downloaded from - http://www.gentei.org/~yuuji/software/windows.el - http://www.gentei.org/~yuuji/software/revive.el -and windows.doc was downloaded from - http://www.gentei.org/~yuuji/software/windows.doc - -Upstream Author: HIROSE Yuuji - -Copyright: -;;; (c) 1993-2005 by HIROSE Yuuji - -;;; This program is distributed as a free software. The author is -;;; not responsible for any possible defects caused by this -;;; software. -;;; -;;; Comments and bug reports are welcome. Don't hesitated to -;;; report. My possible e-mail address is following. -;;; -;;; yuuji@gentei.org - -The author has clarified his definition of free software by providing this -explanation: - -;; * Can I incorporate this program into Debian package? -;; -;; Yes. -;; This "Yes" is NOT a special answer only for Debian. -;; My recognition on `free software' is not the permanently -;; constant notion. Therefore I won't define the fixed license -;; sentences at any moment of my life. All I can say now is I hope -;; the free software be; freely usable, freely (re-)distributable -;; without any charge for itself, freely modifiable unless the -;; original author(=me)'s copyrights are infringed or neglected, -;; absolutely not responsible to any result from itself. If there -;; is A license clauses which implies these points above in some -;; era, this software can be classified into the group that the -;; clauses want to assume as `free'. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: windows.el +Upstream-Contact: HIROSE Yuuji +Source: https://www.gentei.org/~yuuji/software/ + +Files: * +Copyright: HIROSE Yuuji +License: BSD-2-clause + +Files: debian/* +Copyright: 1999-2003 Takao KAWAMURA + 2006-2020 Hubert Chathi +License: BSD-2-clause + +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru windows-el-2.48/debian/rules windows-el-2.55/debian/rules --- windows-el-2.48/debian/rules 2020-07-22 07:08:27.000000000 +0000 +++ windows-el-2.55/debian/rules 2020-07-21 18:28:02.000000000 +0000 @@ -9,6 +9,9 @@ build: # don't need to do anything to build +build-arch: build +build-indep: build + clean: dh_testdir dh_testroot @@ -20,7 +23,7 @@ install-stamp: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs dh_install diff -Nru windows-el-2.48/debian/source/format windows-el-2.55/debian/source/format --- windows-el-2.48/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ windows-el-2.55/debian/source/format 2020-07-21 18:28:02.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru windows-el-2.48/revive.el windows-el-2.55/revive.el --- windows-el-2.48/revive.el 2013-07-02 16:07:07.000000000 +0000 +++ windows-el-2.55/revive.el 2020-07-21 18:33:41.000000000 +0000 @@ -1,7 +1,7 @@ ;;; revive.el --- Resume Emacs -*- coding: euc-jp -*- -;;; (c) 1994-2012 by HIROSE Yuuji [yuuji@gentei.org] -;;; $Id: revive.el,v 2.21 2012/08/12 11:56:06 yuuji Exp yuuji $ -;;; Last modified Thu Oct 18 14:47:17 2012 on firestorm +;;; (c) 1994-2019 by HIROSE Yuuji [yuuji>at +;;;[What is Windows?] +;;; +;;; You can divide the screen of GNU Emacs as many as you like. +;;; Since efficiency of implementation or so depends much on the +;;; style of window division, you may have your own style of +;;; partitioning. But if you switch the mode to e-mail mode or +;;; NetNews mode, they break your favorite style. +;;; Windows.el enables you to have multiple favorite window +;;; configurations at the same time, and switch them. Furthermore, +;;; it can save all window configurations into a file and restore +;;; them correctly. +;;; +;;; **For Emacs 19** +;;; +;;; This package provides the `named(numbered) frame' that can be +;;; selected directly with their name. With revive.el, all frames' +;;; displaying buffers, window configurations and size can be saved +;;; and restored. +;;; +;;;【できる事】 +;;; +;;; GNU Emacs では縦横任意の数だけウィンドウを分割して作業をする事 +;;; ができます。プログラムを開発する時などのウィンドウ分割は効率に大 +;;; きく影響するので、人によって好みの分割形態を持っている事でしょう。 +;;; しかしその途中で、メイルやニュースを読むとその分割形態を壊されて +;;; しまいます。正しい手順でメイルリーダモードを終われば良いのですが、 +;;; それだとまたメイルが来た時に再びメイルリーダモードを起動しなけれ +;;; ばなりません。 +;;; windows.el をロードすると、好みのウィンドウ分割形態を複数持ち、 +;;; それらを切替えながら Emacs を使う事ができます。さらに、その分割 +;;; 形態の全てをファイルにセーブし、いつでもそれらを復元することがで +;;; きます。 +;;; +;;; Emacs 19(Mule2) では、同様の操作体系で frame を単位としてウィ +;;; ンドウ切替え操作を行います。さらに分割形態復元時にはフレームのサ +;;; イズと位置も忠実に再現します。 + diff -Nru windows-el-2.48/windows.el windows-el-2.55/windows.el --- windows-el-2.48/windows.el 2013-07-02 16:04:46.000000000 +0000 +++ windows-el-2.55/windows.el 2020-07-21 18:33:41.000000000 +0000 @@ -1,7 +1,7 @@ ;;; windows.el --- Window manager for GNU Emacs. -*- coding: euc-jp -*- -;;; $Id: windows.el,v 2.48 2010/05/23 12:33:40 yuuji Exp yuuji $ -;;; (c) 1993-2013 by HIROSE Yuuji [yuuji@gentei.org] -;;; Last modified Sun Jan 27 23:47:02 2013 on firestorm +;;; $Id: windows.el,v 2.55 2020/03/07 06:59:27 yuuji Exp $ +;;; (c) 1993-2020 by HIROSE Yuuji [yuuji>at count 0) (not (frame-visible-p frame))) (setq count (1- count)) - (sit-for (string-to-number "0.1"))) + (win:sit-for-a-while)) ;;Emacs 20 becomes not to support top/left for initial parameter. (modify-frame-parameters frame prop))) frame))) @@ -807,7 +795,7 @@ (and (fboundp 'eval-when-compile) (eval-when-compile (require 'revive))) -;; for Emacs-24.3+ and NEmacs +;; for Emacs-24.3+ (defun win:last-key () "Return last-command-event or last-command-char." (if (boundp 'last-command-char) last-command-char last-command-event)) @@ -1089,6 +1077,8 @@ (setq win cwin) (while (not (eq cwin (setq win (next-window win)))) (setq blist (cons (window-buffer win) blist))))) + (win:adjust-window) + (win:store-config win:current-config) (win:delete-window win:current-config arg) (if (and arg (/= cc win:current-config)) (progn @@ -1421,6 +1411,11 @@ (fset 'win:screen-height 'frame-height) (fset 'win:screen-width 'frame-width)) (t (error "I don't know how to run windows.el on this Emacs..."))) +(fset 'win:focus-frame + (cond + ((fboundp 'focus-frame) 'focus-frame) + ((fboundp 'x-focus-frame) 'x-focus-frame) + (t (function (lambda (&rest ignore) nil))))) (defun win:store-config (index) "(Windows low level intenal)Save current configuration in INDEX-th of array." @@ -1513,7 +1508,8 @@ ;; allocating frame here won't work. So we set window-setup-hook to ;; do all the jobs after frame initialization has been done. (add-hook 'window-setup-hook - '(lambda () + (function + (lambda () (if (aref win:configs 1) ;Already resumed by resume-windows ;; `emacs -e resume-windows' leads to this section. (progn @@ -1531,7 +1527,7 @@ (while (and (null (visible-frame-list)) (> count 0)) (message "Waiting for frames to be shown...") - (sit-for (string-to-number "0.1")) + (win:sit-for-a-while) (setq count (1- count)))) (select-frame (car @@ -1560,7 +1556,7 @@ (let ((index 1) (frame (aref win:configs 1))) (run-hooks 'win:allocate-frame-hook)) (sit-for 1)) - 'append))) + 'append)))) (t ;not frame environment (win:store-config 1) (win:update-mode-line 1) @@ -1571,7 +1567,7 @@ ;; Functions for resume. ;;; (defconst win:revision - "$Revision: 2.48 $" + "$Revision: 2.55 $" "Revision string of windows.el") (defvar win:revision-prefix ";win;") @@ -1614,7 +1610,7 @@ (kill-sexp 1)) (catch 'here (while (re-search-forward "^(\\([0-9]+\\)" nil 1) - (setq i (string-to-int + (setq i (string-to-number (buffer-substring (match-beginning 1) (match-end 1)))) (if (> i winnum) (progn (open-line 1) (throw 'here t)))))) @@ -1828,13 +1824,15 @@ ;;'visibility attribute is not defined in XEmacs... (or (eq t (frame-visible-p goal)) (make-frame-visible goal)) - (while (not (frame-visible-p goal)) (sit-for 0)) + (or (frame-visible-p goal) (win:sit-for-a-while)) (raise-frame goal) - (select-frame goal) - (if (fboundp 'x-focus-frame) (x-focus-frame goal)) + (win:focus-frame goal) + (if (fboundp 'select-frame-set-input-focus) + (select-frame-set-input-focus goal) ;Emacs26 workaround + (select-frame goal)) (if (not (eq (selected-frame) goal)) nil - (or win:xemacs-p (unfocus-frame)) + (and (fboundp 'unfocus-frame) (not win:xemacs-p) (unfocus-frame)) ;; Emacs-21.0.9x sometimes fails to display some part of frame (if (string< "21.0.92" emacs-version) (sit-for (string-to-number "1e-5"))) @@ -2291,6 +2289,13 @@ (setq ad-return-value (format "%s%d" ad-return-value win:current-config))))) +;; Workaround for gnupack Emacs24.5 +(and (string-match "24\\.5\\." (emacs-version)) + (string-match "gnupack$" (emacs-version)) + (fboundp 'wrap-function-to-control-ime) + ;; Wrapping function of gnupack emacs24.5 breaks frame creation + (add-hook 'term-setup-hook (function (lambda() (load "windows"))))) + ;;; ;; Final setup. ;;; @@ -2298,6 +2303,31 @@ (run-hooks 'win-load-hook) ;; $Log: windows.el,v $ +;; Revision 2.55 2020/03/07 06:59:27 yuuji +;; Summary: Support emacs27(obsolete 'focus-frame) +;; +;; Revision 2.54 2019/11/04 01:57:24 yuuji +;; Update copyright line +;; +;; Revision 2.53 2018/06/02 06:55:03 yuuji +;; Summary: Possible workaround for Emacs26's behaviour of mouse-followed-focus +;; +;; Revision 2.52 2017/09/09 14:46:43 yuuji +;; Summary: License changed. +;; +;; Revision 2.51 2017/02/21 08:12:44 yuuji +;; Summary: Drop support of NEmacs - Emacs-18(string-to-int -> string-to-number) +;; +;; Revision 2.50 2017/01/16 00:09:57 yuuji +;; Workaround for Emacs 24.5 on gnupack. +;; Emacs 24.5 on gnupack does not update window status at "(sit-for 0)". +;; Instead, calling sit-for with 0.1sec. +;; (Thanks to masutani>at