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

Merge from origin/emacs-25

Browse source 
784602b105 (origin/emacs-25) ; Add release notice
3a34412caa (tag: emacs-25.2) Set Emacs version to 25.2 and update AU...
56a4461a48 ; Move stray item from admin/notes/repo to CONTRIBUTE
2b0d111819 ; CONTRIBUTE: Remove stray header.
f2ab09ec60 Fix a typo in indexing the user manual
bc55a57423 * lisp/menu-bar.el (kill-this-buffer): Doc fix.  (Bug#26466)
a6d50401b4 Document 'line-pixel-height'
0c55cf43e6 * search.c (Fre_search_forward, Fre_search_backward): Imp...
c7ed57eaef Mention that processes start in default-directory (Bug#18...
856ec9ffa1 * src/xdisp.c (vmessage, message): Clarify commentary.
849a0aaa1c Belated fixes for admin.el's M-x make-manuals-dist
84938d7969 default-directory: Remark that it must be a directory name
3f0d047d2e Delete confuse statement in manual
ee1bd94dd0 Improve packaging documentation
fb18bff91f Expand manual section on quitting windows
9a73707964 Fix docstring of dabbrev-abbrev-char-regexp
afe8849bac * doc/misc/cl.texi (Iteration Clauses): Clarify example (...
ada79442c0 ;* doc/misc/info.texi (Choose menu subtopic): Improve ind...
d38fd9229c Narrow scope of modification hook renabling in org-src fo...
e0e9db4c84 ; Spelling fix

# Conflicts:
#	README
#	etc/AUTHORS
#	etc/HISTORY
#	lisp/ldefs-boot.el
This commit is contained in:
Glenn Morris 2017-04-27 22:03:56 -07:00
commit cee4128135
20 changed files with 326 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CONTRIBUTE
View file

@ -209,7 +209,11 @@ reasons. These should be marked by including something like "Do not
merge to master" or anything that matches gitmerge-skip-regexp (see
admin/gitmerge.el) in the commit message.
** Other process information
** GNU ELPA
This repository does not contain the Emacs Lisp package archive
(elpa.gnu.org). See admin/notes/elpa for how to access the GNU ELPA
repository.
** Emacs Mailing lists.

205
ChangeLog.2
View file

@ -1,3 +1,206 @@
2017-04-20 Nicolas Petton <nicolas@petton.fr>
* Version 25.2 released.
2017-04-18 Eli Zaretskii <eliz@gnu.org>
Fix a typo in indexing the user manual
* doc/emacs/cmdargs.texi (General Variables): Fix a horrible typo.
2017-04-12 Eli Zaretskii <eliz@gnu.org>
* lisp/menu-bar.el (kill-this-buffer): Doc fix. (Bug#26466)
2017-04-11 Eli Zaretskii <eliz@gnu.org>
Document 'line-pixel-height'
* doc/lispref/display.texi (Size of Displayed Text): Document
line-pixel-height. Suggested by Tak Kunihiro
<tkk@misasa.okayama-u.ac.jp>. (Bug#26379)
2017-04-07 Hong Xu <hong@topbug.net>
* src/search.c (Fre_search_forward, Fre_search_backward): Improve doc (Bug#25193).
2017-04-07 Noam Postavsky <npostavs@gmail.com>
Mention that processes start in default-directory (Bug#18515)
* doc/lispref/processes.texi (Synchronous Processes):
(Asynchronous Processes):
* lisp/subr.el (start-process):
* src/callproc.c (call-process): Mention that the subprocess starts in
`default-directory' when local, suggest `start-file-process' and
`process-file' otherwise.
2017-04-07 Noam Postavsky <npostavs@gmail.com>
* src/xdisp.c (vmessage, message): Clarify commentary.
2017-04-02 Glenn Morris <rgm@gnu.org>
Belated fixes for admin.el's M-x make-manuals-dist
* admin/admin.el (make-manuals-dist-output-variables): Additions.
(make-manuals-dist--1): Also copy docstyle.texi.
2017-03-31 Tino Calancha <tino.calancha@gmail.com>
default-directory: Remark that it must be a directory name
* src/buffer.c (default-directory): Update docstring (Bug#26272).
2017-03-31 Tino Calancha <tino.calancha@gmail.com>
Delete confuse statement in manual
* doc/misc/cl.texi (For Clauses): Delete confuse statement
and its example (Bug#23550).
2017-03-31 Noam Postavsky <npostavs@gmail.com>
Improve packaging documentation
* doc/lispref/package.texi (Packaging Basics):
* doc/lispref/tips.texi (Library Headers): Clarify some header
formats, relation between file headers and package
attributes (Bug#13281).
2017-03-27 Eric Abrahamsen <eric@ericabrahamsen.net>
Expand manual section on quitting windows
* doc/lispref/windows.texi (Quitting Windows): Provide more
information about the elements of the quit-restore window parameter,
and how they affect the behavior of quit-restore-window.
2017-03-26 Noam Postavsky <npostavs@gmail.com>
Fix docstring of dabbrev-abbrev-char-regexp
* lisp/dabbrev.el (dabbrev-abbrev-char-regexp): Using a value of nil
is equivalent to "\\sw\\|\\s_", and has no special behavior. If the
previous character doesn't match, we search backwards for one that
does, not throw an error. Replace Lisp example with C based one to
make it clear that "symbol" means a sequence of word and symbol
constituent characters, not a Lisp symbol (Bug#358).
2017-03-26 Johan Claesson <johanclaesson@bredband.net> (tiny change)
* doc/misc/cl.texi (Iteration Clauses): Clarify example (Bug#19515).
2017-03-25 Eli Zaretskii <eliz@gnu.org>
;* doc/misc/info.texi (Choose menu subtopic): Improve indexing. (Bug#26236)
2017-03-21 Noam Postavsky <npostavs@gmail.com>
Narrow scope of modification hook renabling in org-src fontification
Modification hooks should be enabled while modifying text in the
org-src temp buffer, but in 2017-01-29 "Call modification hooks in
org-src fontify buffers" the hooks were enabled also for modifications
to the original org buffer. This causes fontification errors when
combined with certain packages, as reported in
http://lists.gnu.org/archive/html/emacs-orgmode/2017-03/msg00420.html.
* lisp/org/org-src.el (org-src-font-lock-fontify-block): Reduce scope
of inhibit-modification-hooks let-binding.
2017-03-17 Eli Zaretskii <eliz@gnu.org>
Improve documentation of interactive "r".
* doc/lispref/commands.texi (Interactive Codes): Mention that mark
must be set for "r" to work.
2017-03-17 Thien-Thi Nguyen <ttn@gnu.org>
Fix bug: Range-check integer ‘alpha’ frame parm value
Typo introduced 2013-04-01, "Prefer < to >
in range checks such as 0 <= i && i < N".
* src/frame.c (x_set_alpha): Use ‘ialpha’, not ‘alpha’.
2017-03-17 Paul Eggert <eggert@cs.ucla.edu>
* etc/PROBLEMS: Say that HP-UX cc doesn't work.
2017-03-14 Eli Zaretskii <eliz@gnu.org>
Fix duplicate wording in Emacs manual
* doc/emacs/programs.texi (Which Function): Delete duplicate
wording. (Bug#26098)
2017-03-14 Hong Xu <hong@topbug.net>
* lisp/paren.el (show-paren--default, show-paren-function): Add docstring.
2017-03-13 Eli Zaretskii <eliz@gnu.org>
Fix wording in Emacs manual
* doc/emacs/text.texi (Paragraphs): Fix a garbled sentence.
(Bug#26086)
2017-03-11 Eli Zaretskii <eliz@gnu.org>
Document how to customize input methods
* doc/emacs/mule.texi (Input Methods): Document how to customize
input methods.
2017-03-11 Eli Zaretskii <eliz@gnu.org>
* lisp/net/eww.el (eww-reload): Doc fix. (Bug#25981)
2017-03-06 Noam Postavsky <npostavs@gmail.com>
Fix warning message about native completion (Bug#25984)
* lisp/progmodes/python.el (python-shell-completion-native-turn-on-maybe):
The relevant variable is `python-shell-completion-native-enable'.
2017-03-04 Eli Zaretskii <eliz@gnu.org>
Clarify documentation of 'raise' and 'height' display specs
* doc/lispref/display.texi (Other Display Specs): Clarify the
effect of 'height' display spec on the following 'raise'.
(Bug#25824)
2017-03-04 Eli Zaretskii <eliz@gnu.org>
Mention problems with GPaste in PROBLEMS
* etc/PROBLEMS (GPaste): Mention the problem in yanking caused by
GPaste, and its solution. (Bug#25902)
2017-02-25 Eli Zaretskii <eliz@gnu.org>
Fix doc strings in info.el
* lisp/info.el (Info-selection-hook, Info-mode-hook)
(Info-edit-mode-hook): Doc fixes. (Bug#25794)
2017-02-25 Eli Zaretskii <eliz@gnu.org>
Fix doc string of 'posn-at-point'
* src/keyboard.c (Fposn_at_point): Clarify the doc string.
(Bug#25796)
2017-02-24 Tino Calancha <tino.calancha@gmail.com>
Documentation fix in elisp reference manual
* doc/lispref/macros.texi (Defining Macros): Drop redundant mention
on 'declare' forms (Bug#25846).
2017-02-18 Noam Postavsky <npostavs@gmail.com>
* lisp/woman.el (woman): Fix docstring prefix arg description.
@ -35641,7 +35844,7 @@
This file records repository revisions from
commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
commit ec4226d81074751c105264a3a3383c48d0a05e41 (inclusive).
commit 3a34412caae002accd0fc7a7fc0b718c2f34159b (inclusive).
See ChangeLog.1 for earlier changes.
;; Local Variables:

9
admin/admin.el
View file

@ -655,7 +655,10 @@ style=\"text-align:left\">")
("@GZIP_PROG@" . "gzip")
("@INSTALL@" . "install -c")
("@INSTALL_DATA@" . "${INSTALL} -m 644")
("@configure_input@" . ""))
("@configure_input@" . "")
("@AM_DEFAULT_VERBOSITY@" . "0")
("@AM_V@" . "${V}")
("@AM_DEFAULT_V@" . "${AM_DEFAULT_VERBOSITY}"))
"Alist of (REGEXP . REPLACEMENT) pairs for `make-manuals-dist'.")
(defun make-manuals-dist--1 (root type)
@ -675,7 +678,9 @@ style=\"text-align:left\">")
(delete-directory stem t))
(make-directory stem)
(copy-file "../doc/misc/texinfo.tex" stem)
(or (equal type "emacs") (copy-file "../doc/emacs/emacsver.texi" stem))
(unless (equal type "emacs")
(copy-file "../doc/emacs/emacsver.texi" stem)
(copy-file "../doc/emacs/docstyle.texi" stem))
(dolist (file (directory-files (format "../doc/%s" type) t))
(if (or (string-match-p "\\(\\.texi\\'\\|/README\\'\\)" file)
(and (equal type "lispintro")

7
admin/notes/repo
View file

@ -1,12 +1,5 @@
NOTES ON COMMITTING TO EMACS'S REPOSITORY -*- outline -*-
** elpa
This branch does not contain a copy of Emacs, but of the Emacs Lisp
package archive (elpa.gnu.org). See admin/notes/elpa for further
explanation, and the README file in the branch for usage
instructions.
* Install changes only on one branch, let them get merged elsewhere if needed.
In particular, install bug-fixes only on the release branch (if there

4
doc/emacs/cmdargs.texi
View file

@ -470,11 +470,11 @@ bus as well as autolaunching the D-Bus session bus if not running yet.
Directory for the architecture-independent files that come with Emacs.
This is used to initialize the variable @code{data-directory}.
@item EMACSDOC
#vindex EMACSDOC, environment variable
@vindex EMACSDOC, environment variable
Directory for the documentation string file, which is used to
initialize the Lisp variable @code{doc-directory}.
@item EMACSLOADPATH
#vindex EMACSLOADPATH, environment variable
@vindex EMACSLOADPATH, environment variable
A colon-separated list of directories@footnote{Here and below,
whenever we say ``colon-separated list of directories'', it pertains
to Unix and GNU/Linux systems. On MS-DOS and MS-Windows, the

6
doc/lispref/display.texi
View file

@ -1974,6 +1974,12 @@ line, if present, in the return value. If it is @code{t}, include the
height of both, if present, in the return value.
@end defun
@defun line-pixel-height
This function returns the height in pixels of the line at point in the
selected window. The value includes the line spacing of the line
(@pxref{Line Height}).
@end defun
@node Line Height
@section Line Height

12
doc/lispref/package.texi
View file

@ -54,7 +54,8 @@ prefix used in the program (@pxref{Coding Conventions}).
@item Version
A version number, in a form that the function @code{version-to-list}
understands (e.g., @samp{11.86}). Each release of a package should be
accompanied by an increase in the version number.
accompanied by an increase in the version number so that it will be
recognized as an upgrade by users querying the package archive.
@item Brief description
This is shown when the package is listed in the Package Menu. It
@ -71,8 +72,9 @@ once it is installed.
A list of other packages (possibly including minimal acceptable
version numbers) on which this package depends. The list may be
empty, meaning this package has no dependencies. Otherwise,
installing this package also automatically installs its dependencies;
if any dependency cannot be found, the package cannot be installed.
installing this package also automatically installs its dependencies,
recursively; if any dependency cannot be found, the package cannot be
installed.
@end table
@cindex content directory, package
@ -212,8 +214,8 @@ subdirectories of the content directory.
One of the files in the content directory must be named
@file{@var{name}-pkg.el}. It must contain a single Lisp form,
consisting of a call to the function @code{define-package}, described
below. This defines the package's version, brief description, and
requirements.
below. This defines the package's attributes: version, brief
description, and requirements.
For example, if we distribute version 1.3 of the superfrobnicator as
a multi-file package, the tar file would be

13
doc/lispref/processes.texi
View file

@ -300,8 +300,11 @@ system, much like text written into a file. @xref{Coding Systems}.
@defun call-process program &optional infile destination display &rest args
This function calls @var{program} and waits for it to finish.
The current working directory of the subprocess is
@code{default-directory}.
The current working directory of the subprocess is set to the current
buffer's value of @code{default-directory} if that is local (as
determined by @code{unhandled-file-name-directory}), or "~" otherwise.
If you want to run a process in a remote directory use
@code{process-file}.
The standard input for the new process comes from file @var{infile} if
@var{infile} is not @code{nil}, and from the null device otherwise.
@ -683,6 +686,12 @@ created with @code{make-pipe-process}, described below.
The original argument list, modified with the actual connection
information, is available via the @code{process-contact} function.
The current working directory of the subprocess is set to the current
buffer's value of @code{default-directory} if that is local (as
determined by `unhandled-file-name-directory'), or "~" otherwise. If
you want to run a process in a remote direcotry use
@code{start-file-process}.
@end defun
@defun make-pipe-process &rest args

11
doc/lispref/tips.texi
View file

@ -1046,12 +1046,15 @@ package manager both at download time (to ensure that a complete set
of packages is downloaded) and at activation time (to ensure that a
package is only activated if all its dependencies have been).
Its format is a list of lists. The @code{car} of each sub-list is the
name of a package, as a symbol. The @code{cadr} of each sub-list is
the minimum acceptable version number, as a string. For instance:
Its format is a list of lists on a single line. The @code{car} of
each sub-list is the name of a package, as a symbol. The @code{cadr}
of each sub-list is the minimum acceptable version number, as a string
that can be parse by @code{version-to-list}. An entry that lacks a
version (i.e., an entry which is just a symbol, or a sub-list of one
element) is equivalent to entry with version "0". For instance:
@smallexample
;; Package-Requires: ((gnus "1.0") (bubbles "2.7.2"))
;; Package-Requires: ((gnus "1.0") (bubbles "2.7.2") cl-lib (seq))
@end smallexample
The package code automatically defines a package named @samp{emacs}

16
doc/misc/cl.texi
View file

@ -1976,18 +1976,6 @@ This clause iterates @var{var} over all the cons cells of @var{list}.
@result{} ((1 2 3 4) (2 3 4) (3 4) (4))
@end example
With @code{by}, there is no real reason that the @code{on} expression
must be a list. For example:
@example
(cl-loop for x on first-animal by 'next-animal collect x)
@end example
@noindent
where @code{(next-animal x)} takes an ``animal'' @var{x} and returns
the next in the (assumed) sequence of animals, or @code{nil} if
@var{x} was the last animal in the sequence.
@item for @var{var} in-ref @var{list} by @var{function}
This is like a regular @code{in} clause, but @var{var} becomes
a @code{setf}-able ``reference'' onto the elements of the list
@ -2252,8 +2240,8 @@ were non-@code{nil}, the loop returns @code{t}:
@example
(if (cl-loop for size in size-list always (> size 10))
(some-big-sizes)
(no-big-sizes))
(only-big-sizes)
(some-small-sizes))
@end example
@item never @var{condition}

6
doc/misc/info.texi
View file

@ -1108,6 +1108,7 @@ other file with @kbd{g(@var{filename})*@key{RET}}.
@kindex 1 @r{through} 9 @r{(Info mode)}
@findex Info-nth-menu-item
@cindex select @var{n}'th menu item
@cindex menu items, select by their numbers
If you begrudge each character of type-in which your system requires,
you might like to use the commands @kbd{1}, @kbd{2}, @kbd{3}, @kbd{4},
@dots{}, @kbd{9}. They are short for the @kbd{m} command together
@ -1116,6 +1117,11 @@ in the current node's menu; @kbd{2} goes through the second item, etc.
In the stand-alone reader, @kbd{0} goes through the last menu item;
this is so you need not count how many entries are there.
@cindex 3rd menu item
@cindex third menu item
@cindex 6th menu item
@cindex sixth menu item
@cindex star @samp{*} before menu item
If your display supports multiple fonts, colors or underlining, and
you are using Emacs's Info mode to read Info files, the third, sixth
and ninth menu items have a @samp{*} that stands out, either in color

2
etc/HISTORY
View file

@ -209,6 +209,8 @@ GNU Emacs 24.5 (2015-04-10) emacs-24.5
GNU Emacs 25.1 (2016-09-16) emacs-25.1
GNU Emacs 25.2 (2017-04-20) emacs-25.2
----------------------------------------------------------------------
This file is part of GNU Emacs.

28
lisp/dabbrev.el
View file

@ -191,23 +191,21 @@ This variable has an effect only when the value of
This regexp will be surrounded with \\\\( ... \\\\) when actually used.
Set this variable to \"\\\\sw\" if you want ordinary words or
\"\\\\sw\\\\|\\\\s_\" if you want symbols (including characters whose
syntax is \"symbol\" as well as those whose syntax is \"word\".
\"\\\\sw\\\\|\\\\s_\" if you want symbols (including characters
whose syntax is \"symbol\" as well as those whose syntax is
\"word\"). The abbreviation is from point to the start of the
previous sequence of characters matching this variable.
The value nil has a special meaning: the abbreviation is from point to
previous word-start, but the search is for symbols.
The default value of nil is equivalent to \"\\\\sw\\\\|\\\\s_\".
For instance, if you are programming in Lisp, `yes-or-no-p' is a symbol,
while `yes', `or', `no' and `p' are considered words. If this
variable is nil, then expanding `yes-or-no-' looks for a symbol
starting with or containing `no-'. If you set this variable to
\"\\\\sw\\\\|\\\\s_\", that expansion looks for a symbol starting with
`yes-or-no-'. Finally, if you set this variable to \"\\\\sw\", then
expanding `yes-or-no-' signals an error because `-' is not part of a word;
but expanding `yes-or-no' looks for a word starting with `no'.
The recommended value is nil, which will make dabbrev default to
using \"\\\\sw\\\\|\\\\s_\"."
For instance, suppose the current buffer is in `c-mode'. If this
variable is nil or \"\\\\sw\\\\|\\\\s_\", then expanding
`debug_print_in_' looks for a symbol starting with
`debug_print_in_'. If you set this variable to \"\\\\sw\", that
expansion looks for a word prefixed with `in_' (e.g., it would
match `in_range', but not `in_close_range'). If expanding
`debug_print_in' it would look for a word starting with
`in' (e.g. `integer')."
:type '(choice (const nil)
regexp)
:group 'dabbrev)

5
lisp/menu-bar.el
View file

@ -1898,7 +1898,10 @@ updating the menu."
(defun kill-this-buffer () ; for the menu bar
"Kill the current buffer.
When called in the minibuffer, get out of the minibuffer
using `abort-recursive-edit'."
using `abort-recursive-edit'.
This command can be reliably invoked only from the menu bar,
otherwise it could decide to silently do nothing."
(interactive)
(cond
;; Don't do anything when `menu-frame' is not alive or visible

18
lisp/org/org-src.el
View file

@ -919,15 +919,15 @@ fontification of code blocks see `org-src-fontify-block' and
;; from `jit-lock-function' (Bug#25132).
(let ((inhibit-modification-hooks nil))
(delete-region (point-min) (point-max))
(insert string " ") ;; so there's a final property change
(unless (eq major-mode lang-mode) (funcall lang-mode))
(org-font-lock-ensure)
(setq pos (point-min))
(while (setq next (next-single-property-change pos 'face))
(put-text-property
(+ start (1- pos)) (1- (+ start next)) 'face
(get-text-property pos 'face) org-buffer)
(setq pos next))))
(insert string " ")) ;; so there's a final property change
(unless (eq major-mode lang-mode) (funcall lang-mode))
(org-font-lock-ensure)
(setq pos (point-min))
(while (setq next (next-single-property-change pos 'face))
(put-text-property
(+ start (1- pos)) (1- (+ start next)) 'face
(get-text-property pos 'face) org-buffer)
(setq pos next)))
(add-text-properties
start end
'(font-lock-fontified t fontified t font-lock-multiline t))

7
lisp/subr.el
View file

@ -2077,7 +2077,12 @@ arguments PROGRAM-ARGS are strings to give program as arguments.
If you want to separate standard output from standard error, use
`make-process' or invoke the command through a shell and redirect
one of them using the shell syntax."
one of them using the shell syntax.
The process runs in `default-directory' if that is local (as
determined by `unhandled-file-name-directory'), or \"~\"
otherwise. If you want to run a process in a remote directory
use `start-file-process'."
(unless (fboundp 'make-process)
(error "Emacs was compiled without subprocess support"))
(apply #'make-process

4
src/buffer.c
View file

@ -5629,7 +5629,9 @@ visual lines rather than logical lines. See the documentation of
DEFVAR_PER_BUFFER ("default-directory", &BVAR (current_buffer, directory),
Qstringp,
doc: /* Name of default directory of current buffer.
To interactively change the default directory, use command `cd'. */);
It should be a directory name (as opposed to a directory file-name).
On GNU and Unix systems, directory names end in a slash `/'.
To interactively change the default directory, use command `cd'. */);
DEFVAR_PER_BUFFER ("auto-fill-function", &BVAR (current_buffer, auto_fill_function),
Qnil,

4
src/callproc.c
View file

@ -242,6 +242,10 @@ Otherwise it waits for PROGRAM to terminate
and returns a numeric exit status or a signal description string.
If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
The process runs in `default-directory' if that is local (as
determined by `unhandled-file-name-directory'), or "~" otherwise. If
you want to run a process in a remote directory use `process-file'.
usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{

52
src/search.c
View file

@ -2228,26 +2228,12 @@ See also the functions `match-beginning', `match-end' and `replace-match'. */)
DEFUN ("re-search-backward", Fre_search_backward, Sre_search_backward, 1, 4,
"sRE search backward: ",
doc: /* Search backward from point for match for regular expression REGEXP.
Set point to the beginning of the occurrence found, and return point.
An optional second argument bounds the search; it is a buffer position.
The match found must not begin before that position. A value of nil
means search to the beginning of the accessible portion of the buffer.
Optional third argument, if t, means if fail just return nil (no error).
If not nil and not t, position at limit of search and return nil.
Optional fourth argument COUNT, if a positive number, means to search
for COUNT successive occurrences. If COUNT is negative, search
forward, instead of backward, for -COUNT occurrences. A value of
nil means the same as 1.
With COUNT positive, the match found is the COUNTth to last one (or
last, if COUNT is 1 or nil) in the buffer located entirely before
the origin of the search; correspondingly with COUNT negative.
doc: /* Search backward from point for regular expression REGEXP.
This function is almost identical to `re-search-forward', except that
by default it searches backward instead of forward, and the sign of
COUNT also indicates exactly the opposite searching direction.
Search case-sensitivity is determined by the value of the variable
`case-fold-search', which see.
See also the functions `match-beginning', `match-end', `match-string',
and `replace-match'. */)
See `re-search-forward' for details. */)
(Lisp_Object regexp, Lisp_Object bound, Lisp_Object noerror, Lisp_Object count)
{
return search_command (regexp, bound, noerror, count, -1, 1, 0);
@ -2257,18 +2243,22 @@ DEFUN ("re-search-forward", Fre_search_forward, Sre_search_forward, 1, 4,
"sRE search: ",
doc: /* Search forward from point for regular expression REGEXP.
Set point to the end of the occurrence found, and return point.
An optional second argument bounds the search; it is a buffer position.
The match found must not end after that position. A value of nil
means search to the end of the accessible portion of the buffer.
Optional third argument, if t, means if fail just return nil (no error).
If not nil and not t, move to limit of search and return nil.
Optional fourth argument COUNT, if a positive number, means to search
for COUNT successive occurrences. If COUNT is negative, search
backward, instead of forward, for -COUNT occurrences. A value of
nil means the same as 1.
With COUNT positive, the match found is the COUNTth one (or first,
if COUNT is 1 or nil) in the buffer located entirely after the
origin of the search; correspondingly with COUNT negative.
The optional second argument BOUND is a buffer position that bounds
the search. The match found must not end after that position. A
value of nil means search to the end of the accessible portion of
the buffer.
The optional third argument NOERROR indicates how errors are handled
when the search fails. If it is nil or omitted, emit an error; if
it is t, simply return nil and do nothing; if it is neither nil nor
t, move to the limit of search and return nil.
The optional fourth argument COUNT is a number that indicates the
search direction and the number of occurrences to search for. If it
is positive, search forward for COUNT successive occurrences; if it
is negative, search backward, instead of forward, for -COUNT
occurrences. A value of nil means the same as 1.
With COUNT positive/negative, the match found is the COUNTth/-COUNTth
one in the buffer located entirely after/before the origin of the
search.
Search case-sensitivity is determined by the value of the variable
`case-fold-search', which see.

10
src/xdisp.c
View file

@ -10530,9 +10530,12 @@ message_with_string (const char *m, Lisp_Object string, bool log)
/* Dump an informative message to the minibuf. If M is 0, clear out
any existing message, and let the mini-buffer text show through.
The message must be safe ASCII and the format must not contain ` or
'. If your message and format do not fit into this category,
convert your arguments to Lisp objects and use Fmessage instead. */
The message must be safe ASCII (because when Emacs is
non-interactive the message is sent straight to stderr without
encoding first) and the format must not contain ` or ' (because
this function does not account for `text-quoting-style'). If your
message and format do not fit into this category, convert your
arguments to Lisp objects and use Fmessage instead. */
static void ATTRIBUTE_FORMAT_PRINTF (1, 0)
vmessage (const char *m, va_list ap)
@ -10590,6 +10593,7 @@ vmessage (const char *m, va_list ap)
}
}
/* See vmessage for restrictions on the text of the message. */
void
message (const char *m, ...)
{