Merge from origin/emacs-27

rgmorris · rgmorris · commit a76e7d592f42 · 2020-01-24T07:50:22.000-08:00
0bed550 (origin/emacs-27) Remove EmacsOpenPanel and EmacsSavePanel... a033602 * doc/emacs/files.texi (Auto Save Files): Improve indexing... 57fb8b1 Fix inaccurate wording in the Emacs manual 1c48774 Update ERC module URLs 7d1e9c9 Minor doc string clarification in use-hard-newlines
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
@@ -117,9 +117,9 @@ which is Unicode code-point U+2018 @sc{left single quotation mark},
 sometimes called a left single ``curved quote'' or ``curly quote''.
 Similarly, @kbd{C-x 8 ]}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the
 curved quotes @t{’}, @t{“} and @t{”}, respectively.  Also, a working
-Alt key acts like @kbd{C-x 8}; e.g., @kbd{A-[} acts like @kbd{C-x 8 [}
-and inserts @t{‘}.  To see which characters have @kbd{C-x 8}
-shorthands, type @kbd{C-x 8 C-h}.
+@key{Alt} key acts like @kbd{C-x 8} (unless followed by @key{RET});
+e.g., @kbd{A-[} acts like @kbd{C-x 8 [} and inserts @t{‘}.  To see
+which characters have @kbd{C-x 8} shorthands, type @kbd{C-x 8 C-h}.
 
   Alternatively, you can use the command @kbd{C-x 8 @key{RET}}
 (@code{insert-char}).  This prompts for the Unicode name or code-point
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
@@ -1930,10 +1930,12 @@ commonly used, Emacs supports three other modifier keys.  These are
 called @key{Super}, @key{Hyper}, and @key{Alt}.  Few terminals provide
 ways to use these modifiers; the key labeled @key{Alt} on most
 keyboards usually issues the @key{Meta} modifier, not @key{Alt}.  The
-standard key bindings in Emacs do not include any characters with
-these modifiers.  However, you can customize Emacs to assign meanings
-to them.  The modifier bits are labeled as @samp{s-}, @samp{H-} and
-@samp{A-} respectively.
+standard key bindings in Emacs do not include any characters with the
+@key{Super} and @key{Hyper} modifiers, and only a small number of
+standard key bindings use @key{Alt}.  However, you can customize Emacs
+to assign meanings to key bindings that use these modifiers.  The
+modifier bits are labeled as @samp{s-}, @samp{H-} and @samp{A-}
+respectively.
 
   Even if your keyboard lacks these additional modifier keys, you can
 enter it using @kbd{C-x @@}: @kbd{C-x @@ h} adds the Hyper flag to
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
@@ -1079,6 +1079,7 @@ want to make permanent.  Instead, auto-saving is done in a different
 file called the @dfn{auto-save file}, and the visited file is changed
 only when you request saving explicitly (such as with @kbd{C-x C-s}).
 
+@cindex @file{#}, in auto-save file names
   Normally, the auto-save file name is made by appending @samp{#} to the
 front and rear of the visited file name.  Thus, a buffer visiting file
 @file{foo.c} is auto-saved in a file @file{#foo.c#}.  Most buffers that
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
@@ -4,7 +4,7 @@
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
+;; URL: https://www.emacswiki.org/emacs/ErcAutoAway
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
@@ -5,7 +5,7 @@
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: irc, button, url, regexp
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcButton
+;; URL: https://www.emacswiki.org/emacs/ErcButton
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
@@ -4,7 +4,7 @@
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
+;; URL: https://www.emacswiki.org/emacs/ERC
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
@@ -5,7 +5,7 @@
 ;; Author: Andreas Fuchs <asf@void.at>
 ;;         Mario Lang <mlang@delysid.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcFilling
+;; URL: https://www.emacswiki.org/emacs/ErcFilling
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
@@ -5,7 +5,6 @@
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: comm
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcIbuffer
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
@@ -6,7 +6,7 @@
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: comm
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcImenu
+;; URL: https://www.emacswiki.org/emacs/ErcImenu
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
@@ -5,7 +5,7 @@
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: irc
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoJoin
+;; URL: https://www.emacswiki.org/emacs/ErcAutoJoin
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
@@ -5,7 +5,7 @@
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Old-Version: 1.0.0
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcLang
+;; URL: https://www.emacswiki.org/emacs/ErcLang
 ;; Keywords: comm languages processes
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
@@ -5,6 +5,7 @@
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Old-Version: 0.1
+;; URL: https://www.emacswiki.org/emacs/ErcList
 ;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
@@ -4,6 +4,7 @@
 
 ;; Author: Lawrence Mitchell <wence@gmx.li>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
+;; URL: https://www.emacswiki.org/emacs/ErcLogging
 ;; Keywords: IRC, chat, client, Internet, logging
 
 ;; Created 2003-04-26
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
@@ -5,7 +5,7 @@
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: comm, faces
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcMatch
+;; URL: https://www.emacswiki.org/emacs/ErcMatch
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
@@ -4,6 +4,7 @@
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
+;; URL: https://www.emacswiki.org/emacs/ErcNotify
 ;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
@@ -5,7 +5,7 @@
 ;; Author: Sacha Chua <sacha@free.net.ph>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: comm, convenience
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
+;; URL: http://wwws.emacswiki.org/emacs/ErcCompletion
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
@@ -5,6 +5,7 @@
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
+;; URL: https://www.emacswiki.org/emacs/ErcReplace
 ;; Keywords: IRC, client, Internet
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
@@ -5,7 +5,7 @@
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: comm
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcHistory
+;; URL: https://www.emacswiki.org/emacs/ErcHistory
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
 
 ;; Maintainer: Amin Bandali <mab@gnu.org>
+;; URL: https://www.emacswiki.org/emacs/ErcNickserv
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2003, 2006-2020 Free Software Foundation, Inc.
 
 ;; Maintainer: Amin Bandali <mab@gnu.org>
+;; URL: https://www.emacswiki.org/emacs/ErcSound
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
@@ -5,6 +5,7 @@
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Contributor: Eric M. Ludlam <zappo@gnu.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
+;; URL: https://www.emacswiki.org/emacs/ErcSpeedbar
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
@@ -5,7 +5,7 @@
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: irc
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcSpelling
+;; URL: https://www.emacswiki.org/emacs/ErcSpelling
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
@@ -5,7 +5,7 @@
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: comm, processes, timestamp
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcStamp
+;; URL: https://www.emacswiki.org/emacs/ErcStamp
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
@@ -5,7 +5,7 @@
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
 ;; Keywords: comm, faces
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcChannelTracking
+;; URL: https://www.emacswiki.org/emacs/ErcChannelTracking
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
@@ -4,6 +4,7 @@
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: Amin Bandali <mab@gnu.org>
+;; URL: https://www.emacswiki.org/emacs/ErcTruncation
 ;; Keywords: IRC, chat, client, Internet, logging
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
@@ -35,7 +35,7 @@
 
 (put 'use-hard-newlines 'permanent-local t)
 (define-minor-mode use-hard-newlines
-  "Toggle distinguishing between hard and soft newlines.
+  "Toggle between hard and soft newlines in the current buffer.
 
 When enabled, the functions `newline' and `open-line' add the
 text-property `hard' to newlines that they insert, and a line is
diff --git a/src/nsfns.m b/src/nsfns.m
@@ -1634,7 +1634,7 @@ Frames are listed from topmost (first) to bottommost (last).  */)
     dirS = [dirS stringByExpandingTildeInPath];
 
   panel = isSave ?
-    (id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel];
+    (id)[NSSavePanel savePanel] : (id)[NSOpenPanel openPanel];
 
   [panel setTitle: promptS];
 
@@ -3089,29 +3089,6 @@ The position is returned as a cons cell (X . Y) of the
   return ret;
 }
 
-@implementation EmacsSavePanel
-- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
-{
-  BOOL ret = handlePanelKeys (self, theEvent);
-  if (! ret)
-    ret = [super performKeyEquivalent:theEvent];
-  return ret;
-}
-@end
-
-
-@implementation EmacsOpenPanel
-- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
-{
-  // NSOpenPanel inherits NSSavePanel, so passing self is OK.
-  BOOL ret = handlePanelKeys (self, theEvent);
-  if (! ret)
-    ret = [super performKeyEquivalent:theEvent];
-  return ret;
-}
-@end
-
-
 @implementation EmacsFileDelegate
 /* --------------------------------------------------------------------------
    Delegate methods for Open/Save panels
diff --git a/src/nsterm.h b/src/nsterm.h
@@ -597,22 +597,6 @@ typedef id instancetype;
 @end
 
 
-/* ==========================================================================
-
-   File open/save panels
-   This and next override methods to handle keyboard input in panels.
-
-   ========================================================================== */
-
-@interface EmacsSavePanel : NSSavePanel
-{
-}
-@end
-@interface EmacsOpenPanel : NSOpenPanel
-{
-}
-@end
-
 @interface EmacsFileDelegate : NSObject
 {
 }

-Original file line number
+Diff line change
 ;; Author: Jorgen Schaefer <[email protected]>
 ;; Maintainer: Amin Bandali <[email protected]>
 -;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
 +;; URL: https://www.emacswiki.org/emacs/ErcAutoAway
 ;; This file is part of GNU Emacs.