summaryrefslogtreecommitdiff
path: root/app-emacs/elscreen/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /app-emacs/elscreen/files
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'app-emacs/elscreen/files')
-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
3 files changed, 0 insertions, 226 deletions
diff --git a/app-emacs/elscreen/files/50elscreen-gentoo.el b/app-emacs/elscreen/files/50elscreen-gentoo.el
deleted file mode 100644
index 431f7e90ae73..000000000000
--- a/app-emacs/elscreen/files/50elscreen-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(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
deleted file mode 100644
index dbcb77557f17..000000000000
--- a/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- 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
deleted file mode 100644
index b8225070a675..000000000000
--- a/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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)