procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
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
This commit is contained in:
Glenn Morris 2020-01-24 07:50:22 -08:00
commit a76e7d592f
28 changed files with 33 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/emacs/basic.texi
View file

@ -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

10
doc/emacs/custom.texi
View file

@ -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

1
doc/emacs/files.texi
View file

@ -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

2
lisp/erc/erc-autoaway.el
View file

@ -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.

2
lisp/erc/erc-button.el
View file

@ -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.

2
lisp/erc/erc-compat.el
View file

@ -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.

2
lisp/erc/erc-fill.el
View file

@ -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.

1
lisp/erc/erc-ibuffer.el
View file

@ -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.

2
lisp/erc/erc-imenu.el
View file

@ -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.

2
lisp/erc/erc-join.el
View file

@ -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.

2
lisp/erc/erc-lang.el
View file

@ -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.

1
lisp/erc/erc-list.el
View file

@ -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.

1
lisp/erc/erc-log.el
View file

@ -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

2
lisp/erc/erc-match.el
View file

@ -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.

1
lisp/erc/erc-notify.el
View file

@ -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.

2
lisp/erc/erc-pcomplete.el
View file

@ -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.

1
lisp/erc/erc-replace.el
View file

@ -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.

2
lisp/erc/erc-ring.el
View file

@ -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.

1
lisp/erc/erc-services.el
View file

@ -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.

1
lisp/erc/erc-sound.el
View file

@ -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.

1
lisp/erc/erc-speedbar.el
View file

@ -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.

2
lisp/erc/erc-spelling.el
View file

@ -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.

2
lisp/erc/erc-stamp.el
View file

@ -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.

2
lisp/erc/erc-track.el
View file

@ -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.

1
lisp/erc/erc-truncate.el
View file

@ -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.

2
lisp/textmodes/paragraphs.el
View file

@ -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

25
src/nsfns.m
View file

@ -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

16
src/nsterm.h
View file

@ -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
{
}