[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master a76e7d5 3/3: Merge from origin/emacs-27
|
From: |
Glenn Morris |
|
Subject: |
master a76e7d5 3/3: Merge from origin/emacs-27 |
|
Date: |
Fri, 24 Jan 2020 10:55:13 -0500 (EST) |
branch: master
commit a76e7d592f428e04b868724c9dfe57d35eb3744e
Merge: c7d870d 0bed550
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-27
0bed550e21 (origin/emacs-27) Remove EmacsOpenPanel and EmacsSavePanel...
a0336029db * doc/emacs/files.texi (Auto Save Files): Improve indexing...
57fb8b10c1 Fix inaccurate wording in the Emacs manual
1c487747ab Update ERC module URLs
7d1e9c943f Minor doc string clarification in use-hard-newlines
---
doc/emacs/basic.texi | 6 +++---
doc/emacs/custom.texi | 10 ++++++----
doc/emacs/files.texi | 1 +
lisp/erc/erc-autoaway.el | 2 +-
lisp/erc/erc-button.el | 2 +-
lisp/erc/erc-compat.el | 2 +-
lisp/erc/erc-fill.el | 2 +-
lisp/erc/erc-ibuffer.el | 1 -
lisp/erc/erc-imenu.el | 2 +-
lisp/erc/erc-join.el | 2 +-
lisp/erc/erc-lang.el | 2 +-
lisp/erc/erc-list.el | 1 +
lisp/erc/erc-log.el | 1 +
lisp/erc/erc-match.el | 2 +-
lisp/erc/erc-notify.el | 1 +
lisp/erc/erc-pcomplete.el | 2 +-
lisp/erc/erc-replace.el | 1 +
lisp/erc/erc-ring.el | 2 +-
lisp/erc/erc-services.el | 1 +
lisp/erc/erc-sound.el | 1 +
lisp/erc/erc-speedbar.el | 1 +
lisp/erc/erc-spelling.el | 2 +-
lisp/erc/erc-stamp.el | 2 +-
lisp/erc/erc-track.el | 2 +-
lisp/erc/erc-truncate.el | 1 +
lisp/textmodes/paragraphs.el | 2 +-
src/nsfns.m | 25 +------------------------
src/nsterm.h | 16 ----------------
28 files changed, 33 insertions(+), 62 deletions(-)
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index ac953e1..abb385f 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 4fe7bbb..f39ce40 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 0af3ac2..a89b16b 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 f407015..be7baca 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -4,7 +4,7 @@
;; Author: Jorgen Schaefer <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
-;; 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 a5b7b6c..cb1b71b 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -5,7 +5,7 @@
;; Author: Mario Lang <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 0cffa19..f433abc 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -4,7 +4,7 @@
;; Author: Alex Schroeder <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
-;; 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 ea39cd2..6abbe39 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -5,7 +5,7 @@
;; Author: Andreas Fuchs <address@hidden>
;; Mario Lang <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
-;; 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 c36352b..7a04ff1 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -5,7 +5,6 @@
;; Author: Mario Lang <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 3bec4c0..3fb91ec 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -6,7 +6,7 @@
;; Author: Mario Lang <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 919570e..7bc4f00 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -5,7 +5,7 @@
;; Author: Alex Schroeder <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 3735d80..3ab1f03 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -5,7 +5,7 @@
;; Author: Alex Schroeder <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 0023980..4fba9f4 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -5,6 +5,7 @@
;; Author: Tom Tromey <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 4e4fa8d..e53f3c0 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -4,6 +4,7 @@
;; Author: Lawrence Mitchell <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
+;; 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 a17b8c7..c0f3bf1 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -5,7 +5,7 @@
;; Author: Andreas Fuchs <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 7ccf936..80ae0c3 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -4,6 +4,7 @@
;; Author: Mario Lang <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
+;; 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 a00f8f4..457fd07 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -5,7 +5,7 @@
;; Author: Sacha Chua <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 3455055..dfb2062 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -5,6 +5,7 @@
;; Author: Andreas Fuchs <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
+;; 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 9b847fa..7594b8e 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -5,7 +5,7 @@
;; Author: Alex Schroeder <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 e12cf4e..2d1d855 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 <address@hidden>
+;; 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 a98e763..96d41a6 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 <address@hidden>
+;; 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 01f5053..1c0635c 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -5,6 +5,7 @@
;; Author: Mario Lang <address@hidden>
;; Contributor: Eric M. Ludlam <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
+;; 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 7fdd648..4632329 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -5,7 +5,7 @@
;; Author: Jorgen Schaefer <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 dc7e63b..3717dc0 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -5,7 +5,7 @@
;; Author: Mario Lang <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 9f2cf95..f8c80d2 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -5,7 +5,7 @@
;; Author: Mario Lang <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
;; 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 3fa5795..9de33ff 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -4,6 +4,7 @@
;; Author: Andreas Fuchs <address@hidden>
;; Maintainer: Amin Bandali <address@hidden>
+;; 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 67c8d16..e22e3f4 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 42bd88e..3be4e39 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1634,7 +1634,7 @@ Optional arg DIR_ONLY_P, if non-nil, means choose only
directories. */)
dirS = [dirS stringByExpandingTildeInPath];
panel = isSave ?
- (id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel];
+ (id)[NSSavePanel savePanel] : (id)[NSOpenPanel openPanel];
[panel setTitle: promptS];
@@ -3089,29 +3089,6 @@ handlePanelKeys (NSSavePanel *panel, NSEvent *theEvent)
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 8baa65f..7d12ecc 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
{
}