aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2021-12-07 14:34:29 +0100
committerStefan Kangas2021-12-07 14:44:34 +0100
commitc94b81bfc1877e4e7057c66cb73bd0942e9fd218 (patch)
tree6daede7231084546549b88811137c12f71b5b43e
parentdb56e32d1241a6573cb7b688362669abec28e648 (diff)
downloademacs-c94b81bfc1877e4e7057c66cb73bd0942e9fd218.tar.gz
emacs-c94b81bfc1877e4e7057c66cb73bd0942e9fd218.zip
Remove some unnecessary references to Emacs 22
* lisp/cedet/semantic/fw.el: * lisp/emacs-lisp/bytecomp.el (byte-compile-from-buffer): * lisp/emulation/viper-util.el (viper-frame-value): * lisp/mail/rmail.el (rmail-delete-headers): * lisp/mh-e/mh-e.el (mh-inc-spool-list): Remove some unnecessary references to Emacs 22.
-rw-r--r--lisp/cedet/semantic/fw.el2
-rw-r--r--lisp/emacs-lisp/bytecomp.el3
-rw-r--r--lisp/emulation/viper-util.el3
-rw-r--r--lisp/mail/rmail.el8
-rw-r--r--lisp/mh-e/mh-e.el2
5 files changed, 3 insertions, 15 deletions
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index 16e8ce8de95..3502cda500e 100644
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -66,8 +66,6 @@
66 66
67(defalias 'semantic-mode-line-update #'force-mode-line-update) 67(defalias 'semantic-mode-line-update #'force-mode-line-update)
68 68
69;; Since Emacs 22 major mode functions should use `run-mode-hooks' to
70;; run major mode hooks.
71(define-obsolete-function-alias 'semantic-run-mode-hooks #'run-mode-hooks "28.1") 69(define-obsolete-function-alias 'semantic-run-mode-hooks #'run-mode-hooks "28.1")
72 70
73;; Fancy compat usage now handled in cedet-compat 71;; Fancy compat usage now handled in cedet-compat
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index b1afa6fe611..644d9f1a470 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2230,8 +2230,7 @@ With argument ARG, insert value in current buffer after the form."
2230 (byte-compile-depth 0) 2230 (byte-compile-depth 0)
2231 (byte-compile-maxdepth 0) 2231 (byte-compile-maxdepth 0)
2232 (byte-compile-output nil) 2232 (byte-compile-output nil)
2233 ;; This allows us to get the positions of symbols read; it's 2233 ;; This allows us to get the positions of symbols read.
2234 ;; new in Emacs 22.1.
2235 (read-with-symbol-positions inbuffer) 2234 (read-with-symbol-positions inbuffer)
2236 (read-symbol-positions-list nil) 2235 (read-symbol-positions-list nil)
2237 ;; #### This is bound in b-c-close-variables. 2236 ;; #### This is bound in b-c-close-variables.
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 71043b189db..0af54b37432 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -79,9 +79,6 @@
79(defmacro viper-frame-value (variable) 79(defmacro viper-frame-value (variable)
80 "Return the value of VARIABLE local to the current frame, if there is one. 80 "Return the value of VARIABLE local to the current frame, if there is one.
81Otherwise return the normal value." 81Otherwise return the normal value."
82 ;; Frame-local variables are obsolete from Emacs 22.2 onwards,
83 ;; so we do it by hand instead.
84 ;; Buffer-local values take precedence over frame-local ones.
85 `(if (local-variable-p ',variable) 82 `(if (local-variable-p ',variable)
86 ,variable 83 ,variable
87 ;; Distinguish between no frame parameter and a frame parameter 84 ;; Distinguish between no frame parameter and a frame parameter
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 9fbc9ba180f..afcb7f39bf2 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4125,10 +4125,8 @@ typically for purposes of moderating a list."
4125 "A regexp that matches the separator before the text of a failed message.") 4125 "A regexp that matches the separator before the text of a failed message.")
4126 4126
4127(defvar mail-mime-unsent-header "^Content-Type: message/rfc822 *$" 4127(defvar mail-mime-unsent-header "^Content-Type: message/rfc822 *$"
4128 "A regexp that matches the header of a MIME body part with a failed message.") 4128 "A regexp that matches the header of a MIME body part with a failed message.")
4129 4129
4130;; This is a cut-down version of rmail-clear-headers from Emacs 22.
4131;; It doesn't have the same functionality, hence the name change.
4132(defun rmail-delete-headers (regexp) 4130(defun rmail-delete-headers (regexp)
4133 "Delete any mail headers matching REGEXP. 4131 "Delete any mail headers matching REGEXP.
4134The message should be narrowed to just the headers." 4132The message should be narrowed to just the headers."
@@ -4136,10 +4134,6 @@ The message should be narrowed to just the headers."
4136 (goto-char (point-min)) 4134 (goto-char (point-min))
4137 (while (re-search-forward regexp nil t) 4135 (while (re-search-forward regexp nil t)
4138 (beginning-of-line) 4136 (beginning-of-line)
4139 ;; This code from Emacs 22 doesn't seem right, since r-n-h is
4140 ;; just for display.
4141;;; (if (looking-at rmail-nonignored-headers)
4142;;; (forward-line 1)
4143 (delete-region (point) 4137 (delete-region (point)
4144 (save-excursion 4138 (save-excursion
4145 (if (re-search-forward "\n[^ \t]" nil t) 4139 (if (re-search-forward "\n[^ \t]" nil t)
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 4e1ca2897bc..17faff0716c 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1607,7 +1607,7 @@ on the \"INS\" button. Enter a \"Spool File\" of \"~/mail/mh-e\", a
1607\"Folder\" of \"mh-e\", and a \"Key Binding\" of \"m\". 1607\"Folder\" of \"mh-e\", and a \"Key Binding\" of \"m\".
1608 1608
1609You can use \"xbuffy\" to automate the incorporation of this mail 1609You can use \"xbuffy\" to automate the incorporation of this mail
1610using the Emacs 22 command \"emacsclient\" as follows: 1610using \"emacsclient\" as follows:
1611 1611
1612 box ~/mail/mh-e 1612 box ~/mail/mh-e
1613 title mh-e 1613 title mh-e