diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index ac953e1907b..abb385f53d5 100644 --- 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 index 4fe7bbb275d..f39ce40931c 100644 --- 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 index 0af3ac24eb1..a89b16b3f6d 100644 --- 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 index f4070155561..be7baca7199 100644 --- a/lisp/erc/erc-autoaway.el +++ b/lisp/erc/erc-autoaway.el @@ -4,7 +4,7 @@ ;; Author: Jorgen Schaefer ;; Maintainer: Amin Bandali -;; 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 index a5b7b6c6b2c..cb1b71b46c2 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -5,7 +5,7 @@ ;; Author: Mario Lang ;; Maintainer: Amin Bandali ;; 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 index 0cffa19b424..f433abc8d24 100644 --- a/lisp/erc/erc-compat.el +++ b/lisp/erc/erc-compat.el @@ -4,7 +4,7 @@ ;; Author: Alex Schroeder ;; Maintainer: Amin Bandali -;; 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 index ea39cd2c01d..6abbe398855 100644 --- a/lisp/erc/erc-fill.el +++ b/lisp/erc/erc-fill.el @@ -5,7 +5,7 @@ ;; Author: Andreas Fuchs ;; Mario Lang ;; Maintainer: Amin Bandali -;; 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 index c36352bf8bf..7a04ff1c0ec 100644 --- a/lisp/erc/erc-ibuffer.el +++ b/lisp/erc/erc-ibuffer.el @@ -5,7 +5,6 @@ ;; Author: Mario Lang ;; Maintainer: Amin Bandali ;; 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 index 3bec4c0e4b5..3fb91ec6868 100644 --- a/lisp/erc/erc-imenu.el +++ b/lisp/erc/erc-imenu.el @@ -6,7 +6,7 @@ ;; Author: Mario Lang ;; Maintainer: Amin Bandali ;; 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 index 919570e2a48..7bc4f004793 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -5,7 +5,7 @@ ;; Author: Alex Schroeder ;; Maintainer: Amin Bandali ;; 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 index 3735d80a867..3ab1f033651 100644 --- a/lisp/erc/erc-lang.el +++ b/lisp/erc/erc-lang.el @@ -5,7 +5,7 @@ ;; Author: Alex Schroeder ;; Maintainer: Amin Bandali ;; 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 index 0023980092a..4fba9f4c0fd 100644 --- a/lisp/erc/erc-list.el +++ b/lisp/erc/erc-list.el @@ -5,6 +5,7 @@ ;; Author: Tom Tromey ;; Maintainer: Amin Bandali ;; 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 index 4e4fa8d6090..e53f3c0cf3a 100644 --- a/lisp/erc/erc-log.el +++ b/lisp/erc/erc-log.el @@ -4,6 +4,7 @@ ;; Author: Lawrence Mitchell ;; Maintainer: Amin Bandali +;; 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 index a17b8c74399..c0f3bf19670 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -5,7 +5,7 @@ ;; Author: Andreas Fuchs ;; Maintainer: Amin Bandali ;; 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 index 7ccf936f23e..80ae0c3ae8b 100644 --- a/lisp/erc/erc-notify.el +++ b/lisp/erc/erc-notify.el @@ -4,6 +4,7 @@ ;; Author: Mario Lang ;; Maintainer: Amin Bandali +;; 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 index a00f8f43f22..457fd07ecc8 100644 --- a/lisp/erc/erc-pcomplete.el +++ b/lisp/erc/erc-pcomplete.el @@ -5,7 +5,7 @@ ;; Author: Sacha Chua ;; Maintainer: Amin Bandali ;; 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 index 3455055e975..dfb20626fd5 100644 --- a/lisp/erc/erc-replace.el +++ b/lisp/erc/erc-replace.el @@ -5,6 +5,7 @@ ;; Author: Andreas Fuchs ;; Maintainer: Amin Bandali +;; 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 index 9b847fa50fd..7594b8efd50 100644 --- a/lisp/erc/erc-ring.el +++ b/lisp/erc/erc-ring.el @@ -5,7 +5,7 @@ ;; Author: Alex Schroeder ;; Maintainer: Amin Bandali ;; 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 index e12cf4eeb58..2d1d8556b20 100644 --- 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 +;; 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 index a98e7630d14..96d41a64e73 100644 --- 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 +;; 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 index 01f5053f02f..1c0635c528c 100644 --- a/lisp/erc/erc-speedbar.el +++ b/lisp/erc/erc-speedbar.el @@ -5,6 +5,7 @@ ;; Author: Mario Lang ;; Contributor: Eric M. Ludlam ;; Maintainer: Amin Bandali +;; 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 index 7fdd6489956..4632329e669 100644 --- a/lisp/erc/erc-spelling.el +++ b/lisp/erc/erc-spelling.el @@ -5,7 +5,7 @@ ;; Author: Jorgen Schaefer ;; Maintainer: Amin Bandali ;; 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 index dc7e63b9821..3717dc0b7f0 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -5,7 +5,7 @@ ;; Author: Mario Lang ;; Maintainer: Amin Bandali ;; 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 index 9f2cf9505a7..f8c80d2e9b0 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -5,7 +5,7 @@ ;; Author: Mario Lang ;; Maintainer: Amin Bandali ;; 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 index 3fa5795c7e5..9de33ff2445 100644 --- a/lisp/erc/erc-truncate.el +++ b/lisp/erc/erc-truncate.el @@ -4,6 +4,7 @@ ;; Author: Andreas Fuchs ;; Maintainer: Amin Bandali +;; 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 index 67c8d16484e..e22e3f48994 100644 --- 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 index 42bd88eeb47..3be4e390e0d 100644 --- 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 index 8baa65f5783..7d12ecc243c 100644 --- 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 { }