Commit ae0a1a89 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from origin/emacs-25

acae275b ; Spelling fixes
d8fac734 Update README for precompiled windows Emacs.
23570fd9 Clarify documentation of 'vc-responsible-backend' wrt symlinks
f708cb22 Clarify doc string of 'transpose-sexps'
cd05b1db Fix docstring of 'browse-url-firefox-new-window-is-tab'
bdc89eb4 Improve documentation of 'font-lock-remove-keywords'
4a0c590c Fix documentation of the command summary key
0221b7a9 Mark relocation workarounds with REL_ALLOC
parents 66b5222c acae275b
......@@ -223,7 +223,7 @@ basic editing operations under Bazaar.
@cindex SRC
@cindex src
@item
SRC (src) is RCS, reloaded - a specialized version-control system
SRC (src) is RCS, reloaded---a specialized version-control system
designed for single-file projects worked on by only one person. It
allows multiple files with independent version-control histories to
exist in one directory, and is thus particularly well suited for
......
......@@ -1148,6 +1148,21 @@ compares the truenames of the two directories. If @var{dir} does not
name an existing directory, the return value is @code{nil}.
@end defun
@defun vc-responsible-backend file
This function determines the responsible VC backend of the given
@var{file}. For example, if @file{emacs.c} is a file tracked by Git,
@w{@code{(vc-responsible-backend "emacs.c")}} returns @samp{Git}.
Note that if @var{file} is a symbolic link,
@code{vc-responsible-backend} will not resolve it---the backend of the
symbolic link file itself is reported. To get the backend VC of the
file to which @var{file} refers, wrap @var{file} with a symbolic link
resolving function such as @code{file-chase-links}:
@smallexample
(vc-responsible-backend (file-chase-links "emacs.c"))
@end smallexample
@end defun
@node File Attributes
@subsection File Attributes
@cindex file attributes
......
......@@ -2934,7 +2934,9 @@ This function removes @var{keywords} from @code{font-lock-keywords}
for the current buffer or for major mode @var{mode}. As in
@code{font-lock-add-keywords}, @var{mode} should be a major mode
command name or @code{nil}. All the caveats and requirements for
@code{font-lock-add-keywords} apply here too.
@code{font-lock-add-keywords} apply here too. The argument
@var{keywords} must exactly match the one used by the corresponding
@code{font-lock-add-keywords}.
@end defun
For example, the following code adds two fontification patterns for C
......
......@@ -5331,7 +5331,7 @@
2010-07-09 Michael Albinus <michael.albinus@gmx.de>
* dbus.texi (Top): Introduce Index. Emphasize "nil" whereever
* dbus.texi (Top): Introduce Index. Emphasize "nil" wherever
forgotten.
(Type Conversion): Precise conversion of natural numbers.
(Errors and Events): Add "debugging" to concept index. Add variable
......
......@@ -70,7 +70,8 @@ To read about advanced Info commands, type @kbd{n} twice. This
brings you to @cite{Advanced Info Commands}, skipping over the ``Getting
Started'' chapter.
Type @kbd{H} to see a summary of all available commands.
If you are using Emacs, type @kbd{?} to see a summary of all available
commands. In the stand-alone Info reader, type @kbd{H} instead.
@end ifinfo
@end ifnottex
......@@ -393,16 +394,18 @@ the @key{BACKSPACE} key (or @key{DEL}) many times. You can also type
@end format
@kindex ? @r{(Info mode)}
@kindex H @r{(stand-alone Info reader)}
@findex Info-summary
You have just learned a considerable number of commands. If you
want to use one but have trouble remembering which, you should type
@kbd{?}, which displays a brief list of commands. When you are
finished looking at the list, make it go away by typing @key{SPC}
repeatedly.
@kbd{?} (@kbd{H} in the stand-alone Info reader), which displays a
brief list of commands. When you are finished looking at the list,
make it go away by typing @key{SPC} repeatedly.
@format
>> Type a @key{?} now. Press @key{SPC} to see consecutive screenfuls of
the list until finished. Then type @key{SPC} several times. If
>> Type a @key{?} (or @key{H} in the stand-alone Info reader) now.
Press @key{SPC} to see consecutive screenfuls of the list
until finished. Then type @key{SPC} several times. If
you are using Emacs, the help will then go away automatically.
If you are using the stand-alone Info reader, type @kbd{x} to
return here.
......
......@@ -1077,7 +1077,7 @@ major changes for implementers, and module writers:
corresponding hook variables.
The mapping of server commands to hook variables is no longer
done via `erc-event-to-hook', but through an #'equal hashtable,
done via `erc-event-to-hook', but through an #'equal hash table,
`erc-server-responses'. In order to find a hook you do:
(erc-get-hook command)
......
......@@ -551,7 +551,7 @@ System (CLOS). It is used by the other CEDET packages.
** js.el is a new major mode for JavaScript files.
** imap-hash.el is a new library to address IMAP mailboxes as hashtables.
** imap-hash.el is a new library to address IMAP mailboxes as hash tables.
* Incompatible Lisp Changes in Emacs 23.2
......
......@@ -38,7 +38,7 @@ stay within exec_byte_code.
** Add new 'switch' byte-code
This byte-code would take one argument from the stack (the object to test)
and one argument from the constant-pool (a switch table, implemented as an
eq-hashtable) and would jump to the "label" contained in the hashtable.
'eq' hash table) and would jump to the "label" contained in the hash table.
Then add a 'case' special-form that can be compiled to this byte-code.
This would behave just like cl-case, but instead of expanding to cond+eq it
......
......@@ -124,12 +124,12 @@ based on `ede-locate-setup-options'."
t)
(cl-defmethod ede-locate-flush-hash ((loc ede-locate-base))
"For LOC, flush hashtable and start from scratch."
"For LOC, flush hash table and start from scratch."
(oset loc hash (make-hash-table :test 'equal)))
(cl-defmethod ede-locate-file-in-hash ((loc ede-locate-base)
filestring)
"For LOC, is the file FILESTRING in our hashtable?"
"For LOC, is the file FILESTRING in our hash table?"
(gethash filestring (oref loc hash)))
(cl-defmethod ede-locate-add-file-to-hash ((loc ede-locate-base)
......
......@@ -56,7 +56,7 @@
(stream :initform nil
:documentation
"The searchable tag stream for this cache.
NOTE: Can I get rid of this? Use a hashtable instead?")
NOTE: Can I get rid of this? Use a hash table instead?")
(dependants :initform nil
:documentation
"Any other object that is dependent on typecache results.
......
......@@ -460,7 +460,7 @@ See `defclass' for more information."
(cl--slot-descriptor-initform (aref slots i)))))
(setf (eieio--class-class-allocation-values newc) v))
;; Attach slot symbols into a hashtable, and store the index of
;; Attach slot symbols into a hash table, and store the index of
;; this slot as the value this table.
(let* ((slots (eieio--class-slots newc))
;; (cslots (eieio--class-class-slots newc))
......
......@@ -497,7 +497,7 @@ Argument NUM is the number of EOL marks to move."
;;; of line, etc.) it takes a bit of special handling.
;;;
;;; The variable edt-word-entities contains a list of characters which
;;; are to be viewed as distinct words where ever they appear in the
;;; are to be viewed as distinct words wherever they appear in the
;;; buffer. This emulates the EDT line mode command SET ENTITY WORD.
......
......@@ -108,7 +108,7 @@
;;;; Variables and options
(defvar erc-server-responses (make-hash-table :test #'equal)
"Hashtable mapping server responses to their handler hooks.")
"Hash table mapping server responses to their handler hooks.")
(cl-defstruct (erc-response (:conc-name erc-response.))
(unparsed "" :type string)
......@@ -1061,7 +1061,7 @@ See also `erc-server-responses'."
(defun erc-call-hooks (process message)
"Call hooks associated with MESSAGE in PROCESS.
Finds hooks by looking in the `erc-server-responses' hashtable."
Finds hooks by looking in the `erc-server-responses' hash table."
(let ((hook (or (erc-get-hook (erc-response.command message))
'erc-default-server-functions)))
(run-hook-with-args-until-success hook process message)
......@@ -1218,7 +1218,7 @@ add things to `%s' instead."
(put ',fn-name 'definition-name ',name)
(put ',hook-name 'definition-name ',name)
;; Hashtable map of responses to hook variables
;; Hash table map of responses to hook variables
,@(cl-loop for response in (cons name aliases)
for var in (cons hook-name var-alternates)
collect `(puthash ,(format "%s" response) ',var
......
......@@ -227,7 +227,7 @@
table))
(defvar ucs-normalize-decomposition-pair-to-primary-composite nil
"Hashtable of decomposed pair to primary composite.
"Hash table of decomposed pair to primary composite.
Note that Hangul are excluded.")
(setq ucs-normalize-decomposition-pair-to-primary-composite
(ucs-normalize-make-hash-table-from-alist
......
......@@ -39,7 +39,7 @@
(eval-and-compile
(defun indian-regexp-of-hashtbl-keys (hashtbl)
"Returns the regular expression of hashtable keys."
"Return the regular expression of hash table keys."
(let (keys)
(maphash (lambda (key val) (push key keys)) hashtbl)
(regexp-opt keys)))
......
......@@ -1859,7 +1859,7 @@ PROC is used to convert the value to actual data."
(defun mh-index-update-maps (folder &optional origin-map)
"Annotate all as yet unannotated messages in FOLDER with their MD5 hash.
As a side effect msg -> checksum map is updated. Optional
argument ORIGIN-MAP is a hashtable which maps each message in the
argument ORIGIN-MAP is a hash table which maps each message in the
index folder to the original folder and message from whence it
was copied. If present the checksum -> (origin-folder,
origin-index) map is updated too."
......@@ -1913,7 +1913,7 @@ origin-index) map is updated too."
(defun mh-index-update-single-msg (msg checksum origin-map)
"Update various maps for one message.
MSG is a index folder message, CHECKSUM its MD5 hash and
ORIGIN-MAP, if non-nil, a hashtable containing which maps each
ORIGIN-MAP, if non-nil, a hash table containing which maps each
message in the index folder to the folder and message that it was
copied from. The function updates the hash tables
`mh-index-msg-checksum-map' and `mh-index-checksum-origin-map'.
......
......@@ -89,11 +89,11 @@
(real-child-p t))
(defvar mh-thread-id-hash nil
"Hashtable used to canonicalize message identifiers.")
"Hash table used to canonicalize message identifiers.")
(make-variable-buffer-local 'mh-thread-id-hash)
(defvar mh-thread-subject-hash nil
"Hashtable used to canonicalize subject strings.")
"Hash table used to canonicalize subject strings.")
(make-variable-buffer-local 'mh-thread-subject-hash)
(defvar mh-thread-id-table nil
......@@ -109,11 +109,11 @@
(make-variable-buffer-local 'mh-thread-id-index-map)
(defvar mh-thread-subject-container-hash nil
"Hashtable used to group messages by subject.")
"Hash table used to group messages by subject.")
(make-variable-buffer-local 'mh-thread-subject-container-hash)
(defvar mh-thread-duplicates nil
"Hashtable used to associate messages with the same message identifier.")
"Hash table used to associate messages with the same message identifier.")
(make-variable-buffer-local 'mh-thread-duplicates)
(defvar mh-thread-history ()
......
......@@ -365,10 +365,7 @@ If non-nil, then open the URL in a new tab rather than a new window if
(defcustom browse-url-firefox-new-window-is-tab nil
"Whether to open up new windows in a tab or a new window.
If non-nil, then open the URL in a new tab rather than a new window if
`browse-url-firefox' is asked to open it in a new window.
This option is currently ignored on MS-Windows, since the necessary
functionality is not available there."
`browse-url-firefox' is asked to open it in a new window."
:type 'boolean
:group 'browse-url)
......
......@@ -6783,9 +6783,13 @@ are interchanged."
(transpose-subr 'forward-word arg))
(defun transpose-sexps (arg)
"Like \\[transpose-words] but applies to sexps.
Does not work on a sexp that point is in the middle of
if it is a list or string."
"Like \\[transpose-chars] (`transpose-chars'), but applies to sexps.
Unlike `transpose-words', point must be between the two sexps and not
in the middle of a sexp to be transposed.
With non-zero prefix arg ARG, effect is to take the sexp before point
and drag it forward past ARG other sexps (backward if ARG is negative).
If ARG is zero, the sexps ending at or after point and at or after mark
are interchanged."
(interactive "*p")
(transpose-subr
(lambda (arg)
......
......@@ -910,7 +910,7 @@ KEY is a string or vector representing a sequence of keystrokes."
(defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix)
"Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
In other words, OLDDEF is replaced with NEWDEF where ever it appears.
In other words, OLDDEF is replaced with NEWDEF wherever it appears.
Alternatively, if optional fourth argument OLDMAP is specified, we redefine
in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment