From: Stefan Kangas Date: Wed, 10 Mar 2021 04:45:47 +0000 (+0100) Subject: Remove several references to Emacs 22 and earlier X-Git-Tag: emacs-28.0.90~3343 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1c84b4308b509c2215fe19f8c8754d76413d43c;p=emacs.git Remove several references to Emacs 22 and earlier * admin/charsets/mapfiles/README: * doc/emacs/custom.texi (Saving Customizations): * doc/lispintro/emacs-lisp-intro.texi (Simple Extension): * doc/misc/efaq-w32.texi (Location of init file): * doc/misc/gnus-faq.texi (FAQ 1-3): * doc/misc/gnus.texi (Top, Various, Image Enhancements): * lisp/erc/erc-menu.el (menu): * lisp/progmodes/cfengine.el (cfengine-fill-paragraph): Remove some references to Emacs 22 and earlier. * doc/lispref/buffers.texi: * doc/lispref/eval.texi: * doc/lispref/files.texi: * doc/lispref/keymaps.texi: * doc/lispref/loading.texi: * doc/lispref/minibuf.texi: * doc/lispref/positions.texi: * doc/lispref/variables.texi: Remove comments about "Emacs 19 specific" features. --- diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index 60f09125a91..fb078269d6f 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -63,8 +63,8 @@ to "JIS X 0213:2004". * MULE-*.map -Created by using ../mule-charsets.el in Emacs 22 as this: - % emacs-22 -batch -l ../mule-charsets.el +Created by using ../mule-charsets.el in Emacs as this: + % emacs -batch -l ../mule-charsets.el This file is part of GNU Emacs. diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 22900c57392..bd505d27eca 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -388,15 +388,15 @@ file. For example: Emacs versions, like this: @example -(cond ((< emacs-major-version 22) - ;; @r{Emacs 21 customization.} - (setq custom-file "~/.config/custom-21.el")) - ((and (= emacs-major-version 22) +(cond ((< emacs-major-version 28) + ;; @r{Emacs 27 customization.} + (setq custom-file "~/.config/custom-27.el")) + ((and (= emacs-major-version 26) (< emacs-minor-version 3)) - ;; @r{Emacs 22 customization, before version 22.3.} - (setq custom-file "~/.config/custom-22.el")) + ;; @r{Emacs 26 customization, before version 26.3.} + (setq custom-file "~/.config/custom-26.el")) (t - ;; @r{Emacs version 22.3 or later.} + ;; @r{Emacs version 28.1 or later.} (setq custom-file "~/.config/emacs-custom.el"))) (load custom-file) diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index d5c280b7924..5b15a456ff0 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -17532,10 +17532,9 @@ Here is the definition: @need 1250 Now for the keybinding. -Nowadays, function keys as well as mouse button events and -non-@sc{ascii} characters are written within square brackets, without -quotation marks. (In Emacs version 18 and before, you had to write -different function key bindings for each different make of terminal.) +Function keys as well as mouse button events and non-@sc{ascii} +characters are written within square brackets, without quotation +marks. I bind @code{line-to-top-of-window} to my @key{F6} function key like this: @@ -17550,18 +17549,18 @@ Your Init File, emacs, The GNU Emacs Manual}. @cindex Conditional 'twixt two versions of Emacs @cindex Version of Emacs, choosing @cindex Emacs version, choosing -If you run two versions of GNU Emacs, such as versions 22 and 23, and +If you run two versions of GNU Emacs, such as versions 27 and 28, and use one @file{.emacs} file, you can select which code to evaluate with the following conditional: @smallexample @group (cond - ((= 22 emacs-major-version) - ;; evaluate version 22 code + ((= 27 emacs-major-version) + ;; evaluate version 27 code ( @dots{} )) - ((= 23 emacs-major-version) - ;; evaluate version 23 code + ((= 28 emacs-major-version) + ;; evaluate version 28 code ( @dots{} ))) @end group @end smallexample diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 69733f91c4a..0d31b0bc4c6 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -309,7 +309,6 @@ foo This function renames the current buffer to @var{newname}. An error is signaled if @var{newname} is not a string. -@c Emacs 19 feature Ordinarily, @code{rename-buffer} signals an error if @var{newname} is already in use. However, if @var{unique} is non-@code{nil}, it modifies @var{newname} to make a name that is not in use. Interactively, you can @@ -344,7 +343,6 @@ a name. For example: See also the function @code{get-buffer-create} in @ref{Creating Buffers}. @end defun -@c Emacs 19 feature @defun generate-new-buffer-name starting-name &optional ignore This function returns a name that would be unique for a new buffer---but does not create the buffer. It starts with @var{starting-name}, and @@ -879,7 +877,6 @@ then @code{other-buffer} uses that predicate to decide which buffers to consider. It calls the predicate once for each buffer, and if the value is @code{nil}, that buffer is ignored. @xref{Buffer Parameters}. -@c Emacs 19 feature If @var{visible-ok} is @code{nil}, @code{other-buffer} avoids returning a buffer visible in any window on any visible frame, except as a last resort. If @var{visible-ok} is non-@code{nil}, then it does not matter diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index 80e038c96d9..448b8ae17ab 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -332,7 +332,6 @@ or just The built-in function @code{indirect-function} provides an easy way to perform symbol function indirection explicitly. -@c Emacs 19 feature @defun indirect-function function &optional noerror @anchor{Definition of indirect-function} This function returns the meaning of @var{function} as a function. If diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 4110c51099d..2828b50cadb 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -455,7 +455,6 @@ Even though this is not a normal hook, you can use @code{add-hook} and @code{remove-hook} to manipulate the list. @xref{Hooks}. @end defvar -@c Emacs 19 feature @defvar write-contents-functions This works just like @code{write-file-functions}, but it is intended for hooks that pertain to the buffer's contents, not to the particular @@ -486,7 +485,6 @@ this hook to make sure the file you are saving has the current year in its copyright notice. @end defopt -@c Emacs 19 feature @defopt after-save-hook This normal hook runs after a buffer has been saved in its visited file. @end defopt @@ -622,7 +620,6 @@ If @var{start} is @code{nil}, then the command writes the entire buffer contents (@emph{not} just the accessible portion) to the file and ignores @var{end}. -@c Emacs 19 feature If @var{start} is a string, then @code{write-region} writes or appends that string, rather than text from the buffer. @var{end} is ignored in this case. @@ -653,7 +650,6 @@ It also sets the last file modification time for the current buffer to feature is used by @code{save-buffer}, but you probably should not use it yourself. -@c Emacs 19 feature If @var{visit} is a string, it specifies the file name to visit. This way, you can write the data to one file (@var{filename}) while recording the buffer as visiting another file (@var{visit}). The argument @@ -3094,7 +3090,6 @@ which generate the listing with Lisp code. @node Create/Delete Dirs @section Creating, Copying and Deleting Directories @cindex creating, copying and deleting directories -@c Emacs 19 features Most Emacs Lisp file-manipulation functions get errors when used on files that are directories. For example, you cannot delete a directory diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 6a227e3a792..dabf985018f 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -369,7 +369,6 @@ appear directly as bindings in @var{keymap} are also copied recursively, and so on to any number of levels. However, recursive copying does not take place when the definition of a character is a symbol whose function definition is a keymap; the same symbol appears in the new copy. -@c Emacs 19 feature @example @group @@ -1140,7 +1139,6 @@ and have extra events at the end that do not fit into a single key sequence. Then the value is a number, the number of events at the front of @var{key} that compose a complete key. -@c Emacs 19 feature If @var{accept-defaults} is non-@code{nil}, then @code{lookup-key} considers default bindings as well as bindings for the specific events in @var{key}. Otherwise, @code{lookup-key} reports only bindings for @@ -1182,7 +1180,6 @@ not cause an error. This function returns the binding for @var{key} in the current local keymap, or @code{nil} if it is undefined there. -@c Emacs 19 feature The argument @var{accept-defaults} controls checking for default bindings, as in @code{lookup-key} (above). @end defun @@ -1191,12 +1188,10 @@ as in @code{lookup-key} (above). This function returns the binding for command @var{key} in the current global keymap, or @code{nil} if it is undefined there. -@c Emacs 19 feature The argument @var{accept-defaults} controls checking for default bindings, as in @code{lookup-key} (above). @end defun -@c Emacs 19 feature @defun minor-mode-key-binding key &optional accept-defaults This function returns a list of all the active minor mode bindings of @var{key}. More precisely, it returns an alist of pairs @@ -1414,7 +1409,6 @@ standard bindings: @end group @end smallexample -@c Emacs 19 feature If @var{oldmap} is non-@code{nil}, that changes the behavior of @code{substitute-key-definition}: the bindings in @var{oldmap} determine which keys to rebind. The rebindings still happen in @var{keymap}, not diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 8c6aeb04721..e68a1ef314a 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -1052,7 +1052,6 @@ rather than replacing that element. @xref{Eval}. @section Unloading @cindex unloading packages -@c Emacs 19 feature You can discard the functions and variables loaded by a library to reclaim memory for other Lisp objects. To do this, use the function @code{unload-feature}: diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index bbc834004b0..d16409d6c89 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -379,8 +379,6 @@ default, it makes the following bindings: @end table @end defvar -@c In version 18, initial is required -@c Emacs 19 feature @defun read-no-blanks-input prompt &optional initial inherit-input-method This function reads a string from the minibuffer, but does not allow whitespace characters as part of the input: instead, those characters @@ -2475,7 +2473,6 @@ usual minibuffer input functions because they all start by choosing the minibuffer window according to the selected frame. @end defun -@c Emacs 19 feature @defun window-minibuffer-p &optional window This function returns @code{t} if @var{window} is a minibuffer window. @var{window} defaults to the selected window. @@ -2619,7 +2616,6 @@ when the minibuffer is active, not even if you switch to another window to do it. @end defopt -@c Emacs 19 feature If a command name has a property @code{enable-recursive-minibuffers} that is non-@code{nil}, then the command can use the minibuffer to read arguments even if it is invoked from the minibuffer. A command can diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index dc0c7442d8d..769aeed75f8 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -232,7 +232,6 @@ backward until encountering the front of a word, rather than forward. @end deffn @defopt words-include-escapes -@c Emacs 19 feature This variable affects the behavior of @code{forward-word} and @code{backward-word}, and everything that uses them. If it is non-@code{nil}, then characters in the escape and character-quote diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 63438170d1a..0ddf3e465d6 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1696,7 +1696,6 @@ buffer has a buffer-local binding. For example, you could use you are in a C or Lisp mode buffer that has a buffer-local value for this variable. -@c Emacs 19 feature The special forms @code{defvar} and @code{defconst} also set the default value (if they set the variable at all), rather than any buffer-local value. @@ -1708,7 +1707,6 @@ this variable. If @var{symbol} is not buffer-local, this is equivalent to @code{symbol-value} (@pxref{Accessing Variables}). @end defun -@c Emacs 19 feature @defun default-boundp symbol The function @code{default-boundp} tells you whether @var{symbol}'s default value is nonvoid. If @code{(default-boundp 'foo)} returns diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index 2abde2c2843..6eff88b76e3 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -370,11 +370,10 @@ On Windows, the @file{.emacs} file may be called @file{_emacs} for backward compatibility with DOS and FAT filesystems where filenames could not start with a dot. Some users prefer to continue using such a name due to historical problems various Windows tools had in the -past with file names that begin with a dot. In Emacs 22 and later, -the init file may also be called @file{.emacs.d/init.el}. Many of the -other files that are created by lisp packages are now stored in the -@file{.emacs.d} directory too, so this keeps all your Emacs related -files in one place. +past with file names that begin with a dot. The init file may also be +called @file{.emacs.d/init.el}. Many of the other files that are +created by Lisp packages are stored in the @file{.emacs.d} directory +too, which keeps all your Emacs related files in one place. All the files mentioned above should go in your @env{HOME} directory. The @env{HOME} directory is determined by following the steps below: diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 4c29976c05e..35a25262115 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -160,13 +160,7 @@ Where and how to get Gnus? @subsubheading Answer -Gnus is released independent from releases of Emacs. Therefore, the -version bundled with Emacs might not be up to date (e.g., Gnus 5.9 -bundled with Emacs 21 is outdated). -You can get the latest released version of Gnus from -@uref{https://www.gnus.org/dist/gnus.tar.gz} -or from -@uref{https://ftp.gnus.org/pub/gnus/gnus.tar.gz}. +Gnus is bundled with Emacs. @node FAQ 1-4 @subsubheading Question 1.4 diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index faf5366e2ba..b6553c8a636 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -815,7 +815,7 @@ Various * Undo:: Some actions can be undone. * Predicate Specifiers:: Specifying predicates. * Moderation:: What to do if you're a moderator. -* Image Enhancements:: Modern versions of Emacs can display images. +* Image Enhancements:: Emacs can display images. * Fuzzy Matching:: What's the big fuzz? * Thwarting Email Spam:: Simple ways to avoid unsolicited commercial email. * Spam Package:: A package for filtering and processing spam. @@ -22505,7 +22505,7 @@ to you, using @kbd{G b u} and updating the group will usually fix this. * Predicate Specifiers:: Specifying predicates. * Moderation:: What to do if you're a moderator. * Fetching a Group:: Starting Gnus just to read a group. -* Image Enhancements:: Modern versions of Emacs can display images. +* Image Enhancements:: Emacs can display images. * Fuzzy Matching:: What's the big fuzz? * Thwarting Email Spam:: Simple ways to avoid unsolicited commercial email. * Spam Package:: A package for filtering and processing spam. @@ -23668,9 +23668,8 @@ It takes the group name as a parameter. @node Image Enhancements @section Image Enhancements -Emacs 21@footnote{Emacs 21 on MS Windows doesn't -support images, Emacs 22 does.} and up are able to display pictures and -stuff, so Gnus has taken advantage of that. +Emacs is able to display pictures and stuff, so Gnus has taken +advantage of that. @menu * X-Face:: Display a funky, teensy black-and-white image. diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el index 0e334e93bd9..d76e0a345ef 100644 --- a/lisp/erc/erc-menu.el +++ b/lisp/erc/erc-menu.el @@ -110,11 +110,11 @@ ERC menu yet.") (define-erc-module menu nil "Enable a menu in ERC buffers." ((unless erc-menu-defined - ;; make sure the menu only gets defined once, since Emacs 22 + ;; make sure the menu only gets defined once, since Emacs ;; activates it immediately (easy-menu-define erc-menu erc-mode-map "ERC menu" erc-menu-definition) (setq erc-menu-defined t))) - (;; `easy-menu-remove' is a no-op in Emacs 22 + (;; `easy-menu-remove' is a no-op in Emacs (message "You might have to restart Emacs to remove the ERC menu"))) (defun erc-menu-add () diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index bef99f2484b..472788d18e5 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el @@ -987,13 +987,11 @@ Intended as the value of `indent-line-function'." (if (> (- (point-max) pos) (point)) (goto-char (- (point-max) pos))))) -;; This doesn't work too well in Emacs 21.2. See 22.1 development -;; code. (defun cfengine-fill-paragraph (&optional justify) "Fill `paragraphs' in Cfengine code." (interactive "P") (or (if (fboundp 'fill-comment-paragraph) - (fill-comment-paragraph justify) ; post Emacs 21.3 + (fill-comment-paragraph justify) ;; else do nothing in a comment (nth 4 (parse-partial-sexp (save-excursion (beginning-of-defun)