summaryrefslogtreecommitdiff
path: root/app-emacs/elscreen
diff options
context:
space:
mode:
Diffstat (limited to 'app-emacs/elscreen')
-rw-r--r--app-emacs/elscreen/Manifest7
-rw-r--r--app-emacs/elscreen/elscreen-1.4.6-r1.ebuild33
-rw-r--r--app-emacs/elscreen/elscreen-20180321.ebuild2
-rw-r--r--app-emacs/elscreen/files/50elscreen-gentoo.el1
-rw-r--r--app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch154
-rw-r--r--app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch71
6 files changed, 266 insertions, 2 deletions
diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index c1927cd221b5..ddd60baaabf7 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1,4 +1,9 @@
AUX 50elscreen-gentoo-20180321.el 82 BLAKE2B 6f7d7f574bc931161a8baac7c4bd43165703c1b4102755950aaffabb2c09d42be3ce546c0c546ffc43a04f5c946f69e43f92d4d3137befb5a299c2542a331029 SHA512 cd303735ee0a8f293e0d0d5e3e7dafd01d398d6eb6cd8871d99e6727f4d3c06711572ef9a199055f639c2a44c1f8833fafde37f2c71ca92bffc4f7e2454ab2fd
+AUX 50elscreen-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX elscreen-1.4.6-emacs-24.patch 5925 BLAKE2B 1c1b7868093a56aadf4e8b2794d767b07de9123dc2be71f4af063d0ab100ca06a187186c3f685024b44b97a69cdab06732dbda3cf1201e5808e5f531d4b4aa07 SHA512 581f5c2c30fa4ae5a8a2266c40842076126a365f947ceaae32299ac680e74a7ca33b077130ff566c12008c79ba4da504160290da72d33ffab5a4d0b40e46557e
+AUX elscreen-1.4.6-void-variable-argi.patch 2789 BLAKE2B 173a2c94528d93660009e0b73e58cedf9343e415f789219350d41fb7b90fc12d7ee7774f6b5b9a97277d54a34e04b4ac4ff93a413018ca0dc872202ad376e6d2 SHA512 254c76e291848caf19983bc896b5a405b9d52dacb871ba5e9009d77968d5249c2445606fb2507f0d0f67859a955aabf4c717dae2acf94f52daa999237fd27333
+DIST elscreen-1.4.6.tar.gz 21680 BLAKE2B a23b7eb617e67205e816cb5c6588f65d8140788ab9c32b90b9c1f53dc4497e6f8250f3c51c38aa40780872f3d878a34aaf2fb455c61640d327df6e3166a59dc7 SHA512 2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2
DIST elscreen-20180321.tar.gz 36840 BLAKE2B 7157a2040cb3d1bb60eb5c4f672dde35b5f1437a83a0af32138d252cfe44bf8a23013f5672182ece7f2dda5bfbe266247188d59408005d8963837d0958c100d3 SHA512 777835daf328aeddfd8999c37553bf5f57683292cea4f2fdca774e16d7a137ad26e791515000e8092c2ba5e4c2d0aeb03b260e4a2069c4f8a091b014d69ff201
-EBUILD elscreen-20180321.ebuild 767 BLAKE2B b9d41678b1b376c0998c336f2896083c91fc49a42f09fa571108fb84ef5c574101c6d80094e8adb42223ee4801d938992f3a3a57ec5846df519038e688031da7 SHA512 a570847879a85e6eb8e3dc1d21505aa777e10aa46d00b01e5232c57d658680a12c799ebf64139f56066f401657e00f8e8eb0b618ac46d6c15a4775a87769ad8e
+EBUILD elscreen-1.4.6-r1.ebuild 905 BLAKE2B 729e11a757c23a3a863c8fcc8c1be4971793326e03abd0c1f914518cadbf5ad041b1ddb9f3c1eb3e8fde4088f880e28779998498417a3ef65ef2152a8cae356e SHA512 9a5f82f0fac66c21e48ed258768bf9ab76c1c01dca4a19227d20e5785e262fbdf3256949fc215e8314d84cfe25f2e02d6c1610c5960d93fab97f315f8c516485
+EBUILD elscreen-20180321.ebuild 764 BLAKE2B eb56f28fdcb4aae02775c7630464a8500514bcd389b0b12dfc66bebb95246d704154f2bac45e22aeeb43df19fb7dfff5def80da365cfb675f652cf48fbd35b89 SHA512 7ce18561ab23a1b7bda8d0505f272b2e109006ed4548d485d6bc7ee7bc730ce828039d67b7c195b5b0c34d4d1525330ebe571cf81e6b90ab180669aef1f8d296
MISC metadata.xml 1188 BLAKE2B bbd91c8e116ead86174542013b33e6e83d1a464d96191e76619ec31e6c325390bb8516e70c4f81d4e73a98149be619b466ec62aa61178692c1de57b110699017 SHA512 736c8159defd57e17f46623187edb72f03fad76723062a4de6714d45fb1568838109754e735fd691ee9cfcfcb70c1223d641e112f6fcda74e5b84133cb4bdc08
diff --git a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..c2673da73b4c
--- /dev/null
+++ b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit elisp
+
+DESCRIPTION="Frame configuration management for GNU Emacs modelled after GNU Screen"
+HOMEPAGE="http://www.morishima.net/~naoto/j/software/elscreen/"
+SRC_URI="ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+IUSE=""
+
+DEPEND=">=app-emacs/apel-10.8-r1"
+RDEPEND="${DEPEND}"
+
+ELISP_PATCHES="${PN}-1.4.6-void-variable-argi.patch ${PN}-1.4.6-emacs-24.patch"
+
+SITEFILE=50${PN}-gentoo.el
+DOCS="ChangeLog README"
+
+pkg_postinst() {
+ elisp-site-regen
+
+ echo
+ elog "ElScreen modifies standard Emacs keybindings and is therefore"
+ elog "no longer loaded from site-gentoo.el. Add the line"
+ elog " (require 'elscreen)"
+ elog "to your ~/.emacs file to enable it on Emacs startup."
+}
diff --git a/app-emacs/elscreen/elscreen-20180321.ebuild b/app-emacs/elscreen/elscreen-20180321.ebuild
index 53e0bdc32856..fe4b22212f6f 100644
--- a/app-emacs/elscreen/elscreen-20180321.ebuild
+++ b/app-emacs/elscreen/elscreen-20180321.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/knu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="wanderlust"
RDEPEND="wanderlust? ( app-emacs/wanderlust )"
diff --git a/app-emacs/elscreen/files/50elscreen-gentoo.el b/app-emacs/elscreen/files/50elscreen-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/elscreen/files/50elscreen-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch b/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
new file mode 100644
index 000000000000..dbcb77557f17
--- /dev/null
+++ b/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
@@ -0,0 +1,154 @@
+--- elscreen-1.4.6-orig/elscreen.el 2013-05-23 21:31:14.011823000 +1000
++++ elscreen-1.4.6/elscreen.el 2013-10-03 20:55:35.497650931 +1000
+@@ -29,9 +29,9 @@
+ (eval-when-compile
+ (require 'static))
+
+-(static-defconst elscreen-on-xemacs (featurep 'xemacs))
+-(static-defconst elscreen-on-emacs (and (not elscreen-on-xemacs)
+- (>= emacs-major-version 21)))
++(static-defconst elscreen-on-xemacs (featurep 'xemacs)
++ (static-defconst elscreen-on-emacs (and (not elscreen-on-xemacs)
++ (>= emacs-major-version 21))))
+
+
+ ;;; User Customizable Variables:
+@@ -148,7 +148,8 @@
+
+ (static-when elscreen-on-emacs ;; GNU Emacs 21
+ (make-obsolete-variable 'elscreen-tab-display-create-screen
+- 'elscreen-tab-display-control)
++ 'elscreen-tab-display-control
++ "1.4.6")
+ (defcustom elscreen-tab-display-control t
+ "*Non-nil to display control tab at the most left side."
+ :tag "Show/Hide the Control Tab"
+@@ -201,13 +202,13 @@
+ (((class color))
+ (:background "blue" :foreground "black" :underline t)))
+ "Face for tabs other than current screen one."
+- :group 'elscreen))
++ :group 'elscreen)
+
+
+ ;;; Key & Menu bindings:
+
+-(defvar elscreen-map (make-sparse-keymap)
+- "Keymap for ElScreen.")
++ (defvar elscreen-map (make-sparse-keymap)
++ "Keymap for ElScreen."))
+ (define-key elscreen-map "\C-c" 'elscreen-create)
+ (define-key elscreen-map "c" 'elscreen-create)
+ (define-key elscreen-map "C" 'elscreen-clone)
+@@ -899,13 +900,13 @@
+ screen-list-string)
+ (cond
+ ((not (elscreen-screen-live-p screen)) ;; XXX
+- (when (interactive-p)
++ (when (called-interactively-p 'any)
+ (elscreen-message "There is no such screen")))
+ ((null screen-list)
+- (when (interactive-p)
++ (when (called-interactively-p 'any)
+ (elscreen-message "There is only one screen, cannot kill")))
+ ((or
+- (not (interactive-p))
++ (not (called-interactively-p 'any))
+ (yes-or-no-p (format "Really kill screens other than %d? " screen)))
+ (setq screen-list-string (mapconcat
+ (lambda (screen)
+@@ -914,7 +915,7 @@
+ screen-list ","))
+ (elscreen-goto-internal screen)
+ (elscreen-notify-screen-modification 'force-immediately)
+- (when (interactive-p)
++ (when (called-interactively-p 'any)
+ (elscreen-message (format "screen %s killed" screen-list-string)))))
+ screen-list))
+
+@@ -984,7 +985,7 @@
+ (defun elscreen-jump ()
+ "Switch to specified screen."
+ (interactive)
+- (let ((next-screen (string-to-number (string last-command-char))))
++ (let ((next-screen (string-to-number (string last-command-event))))
+ (if (and (<= 0 next-screen) (<= next-screen 9))
+ (elscreen-goto next-screen))))
+ (defalias 'elscreen-jump-0 'elscreen-jump)
+@@ -1046,7 +1047,7 @@
+ (princ (substitute-command-keys
+ (mapconcat 'symbol-value
+ elscreen-help-symbol-list "\n\n")))
+- (print-help-return-message)))
++ (help-print-return-message)))
+
+
+ ;;; Utility Functions
+@@ -1180,7 +1181,7 @@
+ creating one if none already exists."
+ (interactive)
+ (let* ((prompt "Go to the screen with specified buffer: ")
+- (create (or create (interactive-p)))
++ (create (or create (called-interactively-p 'any)))
+ (buffer-name (or (and (bufferp buffer) (buffer-name buffer))
+ (and (stringp buffer) buffer)
+ (and (featurep 'iswitchb)
+@@ -1207,7 +1208,7 @@
+ Use \\[toggle-read-only] to permit editing."
+ (interactive "FFind file read-only in new screen: ")
+ (elscreen-find-file filename)
+- (toggle-read-only 1))
++ (read-only-mode 1))
+
+ (defun elscreen-dired (dirname &optional switches)
+ (interactive (progn
+@@ -1373,27 +1374,28 @@
+ (defvar elscreen-e21-tab-format nil)
+ (make-variable-buffer-local 'elscreen-e21-tab-format)
+
+- (defsubst elscreen-e21-tab-create-keymap (&rest definitions)
+- (let ((keymap (make-sparse-keymap))
+- (key-function-pairs
+- (eval-when-compile
+- (mapcar
+- (lambda (key)
+- (cons key 'ignore))
+- (list 'mouse-1 'mouse-2 'mouse-3
+- 'down-mouse-1 'down-mouse-2 'down-mouse-3
+- 'drag-mouse-1 'drag-mouse-2 'drag-mouse-3)))))
+- (while definitions
+- (set-alist 'key-function-pairs (car definitions) (cadr definitions))
+- (setq definitions (cddr definitions)))
+- (mapc
+- (lambda (key-function-pair)
+- (let ((key (car key-function-pair))
+- (function (cdr key-function-pair)))
+- (define-key keymap (vector 'header-line key) function)))
+- key-function-pairs)
+- keymap))
+-
++ (eval-when-compile
++ (defsubst elscreen-e21-tab-create-keymap (&rest definitions)
++ (let ((keymap (make-sparse-keymap))
++ (key-function-pairs
++ (eval-when-compile
++ (mapcar
++ (lambda (key)
++ (cons key 'ignore))
++ (list 'mouse-1 'mouse-2 'mouse-3
++ 'down-mouse-1 'down-mouse-2 'down-mouse-3
++ 'drag-mouse-1 'drag-mouse-2 'drag-mouse-3)))))
++ (while definitions
++ (set-alist 'key-function-pairs (car definitions) (cadr definitions))
++ (setq definitions (cddr definitions)))
++ (mapc
++ (lambda (key-function-pair)
++ (let ((key (car key-function-pair))
++ (function (cdr key-function-pair)))
++ (define-key keymap (vector 'header-line key) function)))
++ key-function-pairs)
++ keymap)))
++
+ (defsubst elscreen-e21-tab-width ()
+ (if (numberp elscreen-display-tab)
+ elscreen-display-tab
diff --git a/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch b/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
new file mode 100644
index 000000000000..b8225070a675
--- /dev/null
+++ b/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
@@ -0,0 +1,71 @@
+--- elscreen.el.orig 2007-12-29 15:12:05.000000000 +0000
++++ elscreen.el
+@@ -1691,6 +1691,10 @@ Use \\[toggle-read-only] to permit editi
+ ("-e" . elscreen-command-line-funcall))))
+
+ (static-when elscreen-on-emacs
++ (cond
++ ; -----------------------
++ ((< emacs-major-version 23) ; emacs22 or prior to
++ (progn
+ (defun elscreen-e21-command-line ()
+ (when (string-match "\\`-" argi)
+ (error "Unknown option `%s'" argi))
+@@ -1703,11 +1707,55 @@ Use \\[toggle-read-only] to permit editi
+ (elscreen-command-line-find-file file file-count line column))
+ (setq line 0)
+ (setq column 0)
+- t)
++ t) ; defun
+
+ (add-hook 'after-init-hook (lambda ()
+ (add-to-list 'command-line-functions
+- 'elscreen-e21-command-line t))))
++ 'elscreen-e21-command-line t)))) ; progn
++ ) ; else
++ ; -----------------------
++ ((= emacs-major-version 23) ; emacs23
++ (progn
++ (defun elscreen-e23-command-line ()
++ (when (string-match "\\`-" argi)
++ (error "Unknown option `%s'" argi))
++ (setq file-count (1+ file-count))
++ (setq inhibit-startup-buffer-menu t)
++ (let* ((file
++ (expand-file-name
++ (command-line-normalize-file-name orig-argi)
++ cl1-dir)))
++ (elscreen-command-line-find-file file file-count cl1-line cl1-column))
++ (setq cl1-line 0)
++ (setq cl1-column 0)
++ t) ; defun
++
++ (add-hook 'after-init-hook (lambda ()
++ (add-to-list 'command-line-functions
++ 'elscreen-e23-command-line t)))) ; progn
++ ) ; else
++ ; -----------------------
++ ((> emacs-major-version 23) ; emacs24 or later
++ (progn
++ (defun elscreen-e24-command-line ()
++ (when (string-match "\\`-" cl1-argi)
++ (error "Unknown option `%s'" cl1-argi))
++ (setq file-count (1+ file-count))
++ (setq inhibit-startup-buffer-menu t)
++ (let* ((file
++ (expand-file-name
++ (command-line-normalize-file-name orig-argi)
++ cl1-dir)))
++ (elscreen-command-line-find-file file file-count cl1-line cl1-column))
++ (setq cl1-line 0)
++ (setq cl1-column 0)
++ t) ; defun
++
++ (add-hook 'after-init-hook (lambda ()
++ (add-to-list 'command-line-functions
++ 'elscreen-e24-command-line t)))) ; progn
++ )
++ )) ; endif (emacs22 or prior to)
+
+ (static-when elscreen-on-xemacs
+ (defadvice command-line-1 (around elscreen-xmas-command-line-1 activate)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-30 15:49:52 +0000