From 253e30aa895331c42697a6e995f8819385828a6a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 26 Jun 2013 00:16:20 -0700 Subject: [PATCH 1/5] Manual fixes re describe-syntax * doc/emacs/help.texi (Misc Help): Index describe-syntax. * doc/lispref/syntax.texi (Syntax Table Functions): Mention describe-syntax. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/help.texi | 2 ++ doc/lispref/ChangeLog | 4 ++++ doc/lispref/syntax.texi | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9a2f5d98e47..072a13c0904 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Glenn Morris + + * help.texi (Misc Help): Index describe-syntax. + 2013-05-23 Glenn Morris * programs.texi (Semantic): Fix typo. diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index 0a0a3865d2d..0f7e910ec17 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -530,6 +530,8 @@ describes the commands and features that are changed in this mode. @kindex C-h b @findex describe-bindings +@kindex C-h s +@findex describe-syntax @kbd{C-h b} (@code{describe-bindings}) and @kbd{C-h s} (@code{describe-syntax}) show other information about the current environment within Emacs. @kbd{C-h b} displays a list of all the key diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index b851b869ed4..440e5dc8239 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Glenn Morris + + * syntax.texi (Syntax Table Functions): Mention describe-syntax. + 2013-06-19 Glenn Morris * loading.texi (Autoload): Fix typo. diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index dfa121103bc..6bbd7a3a7b7 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -506,6 +506,11 @@ This function returns the current syntax table, which is the table for the current buffer. @end defun +@deffn Command describe-syntax &optional buffer +This command displays the contents of the syntax table of +@var{buffer} (by default, the current buffer) in a help buffer. +@end deffn + @defmac with-syntax-table table body@dots{} This macro executes @var{body} using @var{table} as the current syntax table. It returns the value of the last form in @var{body}, after From e0070075ff06ab67bb2b348e0f265937d6dad48b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Jul 2013 00:42:34 -0700 Subject: [PATCH 2/5] Fix two doc/emacs cross-references * doc/emacs/maintaining.texi (EDE): Fix cross-reference. * doc/emacs/programs.texi (Program Modes): Fix emacs-xtra reference. --- doc/emacs/ChangeLog | 6 ++++++ doc/emacs/maintaining.texi | 2 +- doc/emacs/programs.texi | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 072a13c0904..e7d7c4ea2e7 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2013-07-02 Glenn Morris + + * maintaining.texi (EDE): Fix cross-reference. + + * programs.texi (Program Modes): Fix emacs-xtra reference. + 2013-06-26 Glenn Morris * help.texi (Misc Help): Index describe-syntax. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index acf1a87fc4c..a2401e9a59b 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -2341,7 +2341,7 @@ directory trees. The @dfn{project root} is the topmost directory of a project. To define a new project, visit a file in the desired project root and type @kbd{M-x ede-new}. This command prompts for a @dfn{project type}, which refers to the underlying method that EDE -will use to manage the project (@pxref{Creating a Project, EDE,, ede, +will use to manage the project (@pxref{Creating a project, EDE,, ede, Emacs Development Environment}). The most common project types are @samp{Make}, which uses Makefiles, and @samp{Automake}, which uses GNU Automake (@pxref{Top, Automake,, automake, Automake}). In both cases, diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 70eecf1c97b..8bb851e75a4 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -119,17 +119,17 @@ those specified in the mode's own mode hook (@pxref{Major Modes}). For instance, entering C mode runs the hooks @code{prog-mode-hook} and @code{c-mode-hook}. @xref{Hooks}, for information about hooks. -@ifinfo +@ifnottex Separate manuals are available for the modes for Ada (@pxref{Top,, Ada Mode, ada-mode, Ada Mode}), C/C++/Objective C/Java/Corba IDL/Pike/AWK (@pxref{Top, , CC Mode, ccmode, CC Mode}), and IDLWAVE (@pxref{Top,, IDLWAVE, idlwave, IDLWAVE User Manual}). -@end ifinfo -@ifnotinfo +@end ifnottex +@iftex The Emacs distribution contains Info manuals for the major modes for Ada, C/C++/Objective C/Java/Corba IDL/Pike/AWK, and IDLWAVE@. For Fortran mode, @pxref{Fortran,,, emacs-xtra, Specialized Emacs Features}. -@end ifnotinfo +@end iftex @node Defuns @section Top-Level Definitions, or Defuns From 0946b7cade81add1e51e68e62fdbad2a119ade3c Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Tue, 2 Jul 2013 09:11:15 -0700 Subject: [PATCH 3/5] * configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd (tiny change) http://bugs.debian.org/712974 --- ChangeLog | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 45b6c9152b2..159a1ee4c8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-07-02 Christoph Egger (tiny change) + + * configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang. + http://bugs.debian.org/712974 + 2013-06-22 Glenn Morris * configure.ac: Include X11/X.h when testing for Xft.h. (Bug#14684) diff --git a/configure.ac b/configure.ac index 0ab66a70c7a..3f51039a56e 100644 --- a/configure.ac +++ b/configure.ac @@ -3384,7 +3384,7 @@ emacs_broken_SIGIO=no case $opsys in dnl SIGIO exists, but the feature doesn't work in the way Emacs needs. dnl See eg . - hpux* | irix6-5 | openbsd | sol2* | unixware ) + hpux* | irix6-5 | openbsd | sol2* | unixware | gnu-kfreebsd ) emacs_broken_SIGIO=yes ;; From a944db142f61600922660250cfe264118011dcb4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Jul 2013 20:03:47 -0700 Subject: [PATCH 4/5] Fix some doc/ cross-references * doc/lispintro/emacs-lisp-intro.texi (edebug): * doc/lispref/debugging.texi (Debugging): * doc/lispref/files.texi (File Attributes, Changing Files): * doc/misc/bovine.texi (top): * doc/misc/cc-mode.texi (AWK Mode Font Locking): * doc/misc/mh-e.texi (Preface): * doc/misc/url.texi (URI Parsing): Fix cross-references to other manuals. * doc/lispref/package.texi (Package Archives): Fix @url call. --- doc/lispintro/ChangeLog | 4 ++++ doc/lispintro/emacs-lisp-intro.texi | 4 ++-- doc/lispref/ChangeLog | 7 +++++++ doc/lispref/debugging.texi | 2 +- doc/lispref/files.texi | 6 +++--- doc/lispref/package.texi | 2 +- doc/misc/ChangeLog | 7 +++++++ doc/misc/bovine.texi | 2 +- doc/misc/cc-mode.texi | 2 +- doc/misc/mh-e.texi | 2 +- doc/misc/url.texi | 2 +- 11 files changed, 29 insertions(+), 11 deletions(-) diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 4dd7c0e00a5..95f272eef33 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2013-07-03 Glenn Morris + + * emacs-lisp-intro.texi (edebug): Fix cross-references. + 2013-03-12 Glenn Morris * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 13e12b52785..ec152c2f2d1 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -18619,7 +18619,7 @@ shows which line you are currently executing. You can walk through the execution of a function, line by line, or run quickly until reaching a @dfn{breakpoint} where execution stops. -Edebug is described in @ref{edebug, , Edebug, elisp, The GNU Emacs +Edebug is described in @ref{Edebug, , , elisp, The GNU Emacs Lisp Reference Manual}. @need 1250 @@ -18746,7 +18746,7 @@ error or at specified stopping points; you can cause it to display the changing values of various expressions; you can find out how many times a function is called, and more. -Edebug is described in @ref{edebug, , Edebug, elisp, The GNU Emacs +Edebug is described in @ref{Edebug, , , elisp, The GNU Emacs Lisp Reference Manual}. @need 1500 diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 440e5dc8239..871564aa666 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,10 @@ +2013-07-03 Glenn Morris + + * debugging.texi (Debugging): + * files.texi (File Attributes, Changing Files): Fix cross-references. + + * package.texi (Package Archives): Fix @url call. + 2013-06-26 Glenn Morris * syntax.texi (Syntax Table Functions): Mention describe-syntax. diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi index 24629465525..335e3f802d2 100644 --- a/doc/lispref/debugging.texi +++ b/doc/lispref/debugging.texi @@ -32,7 +32,7 @@ program. @item You can use the ERT package to write regression tests for the program. -@xref{Top,the ERT manual,, ERT, ERT: Emacs Lisp Regression Testing}. +@xref{Top,the ERT manual,, ert, ERT: Emacs Lisp Regression Testing}. @item You can profile the program to get hints about how to make it more efficient. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 49269d71bf9..f3b5f19560f 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1112,7 +1112,7 @@ permissions} of @var{filename}, as an integer. It recursively follows symbolic links in @var{filename} at all levels. If @var{filename} does not exist, the return value is @code{nil}. -@xref{File Permissions,,, coreutils, The @sc{gnu} @code{Coreutils} +@xref{File permissions,,, coreutils, The @sc{gnu} @code{Coreutils} Manual}, for a description of mode bits. If the low-order bit is 1, then the file is executable by all users, if the second-lowest-order bit is 1, then the file is writable by all users, etc. The highest @@ -1599,7 +1599,7 @@ octal numbers to enter @var{mode}. For example, @noindent specifies that the file should be readable and writable for its owner, readable for group members, and readable for all other users. -@xref{File Permissions,,, coreutils, The @sc{gnu} @code{Coreutils} +@xref{File permissions,,, coreutils, The @sc{gnu} @code{Coreutils} Manual}, for a description of mode bit specifications. Interactively, @var{mode} is read from the minibuffer using @@ -1650,7 +1650,7 @@ the permissions on which the specification is based are taken from the mode bits of @var{base-file}. If @var{base-file} is omitted or @code{nil}, the function uses @code{0} as the base mode bits. The complete and relative specifications can be combined, as in -@code{"u+r,g+rx,o+r,g-w"}. @xref{File Permissions,,, coreutils, The +@code{"u+r,g+rx,o+r,g-w"}. @xref{File permissions,,, coreutils, The @sc{gnu} @code{Coreutils} Manual}, for a description of file mode specifications. @end defun diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index ad9f4fc1aea..f4d6b590c77 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -265,7 +265,7 @@ variable @code{load-file-name} (@pxref{Loading}). Here is an example: Via the Package Menu, users may download packages from @dfn{package archives}. Such archives are specified by the variable @code{package-archives}, whose default value contains a single entry: -the archive hosted by the GNU project at @url{elpa.gnu.org}. This +the archive hosted by the GNU project at @url{http://elpa.gnu.org}. This section describes how to set up and maintain a package archive. @cindex base location, package archive diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index b2624e7b05a..57c12d4f946 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,10 @@ +2013-07-03 Glenn Morris + + * bovine.texi (top): + * cc-mode.texi (AWK Mode Font Locking): + * mh-e.texi (Preface): + * url.texi (URI Parsing): Fix cross-references to other manuals. + 2013-06-24 Glenn Morris * eshell.texi: Fix cross-references to other manuals. diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi index 978345e5cc8..81ec2eb80ec 100644 --- a/doc/misc/bovine.texi +++ b/doc/misc/bovine.texi @@ -76,7 +76,7 @@ The @dfn{bovine} parser is the original @semantic{} parser, and is an implementation of an @acronym{LL} parser. It is good for simple languages. It has many conveniences making grammar writing easy. The conveniences make it less powerful than a Bison-like @acronym{LALR} -parser. For more information, @inforef{top, the Wisent Parser Manual, +parser. For more information, @inforef{Top, The Wisent Parser Manual, wisent}. Bovine @acronym{LL} grammars are stored in files with a @file{.by} diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index bb6a5b001ad..52a0cea53c2 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -2111,7 +2111,7 @@ contributing it: send a note to @email{bug-cc-mode@@gnu.org}. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! The general appearance of font-locking in AWK mode is much like in any -other programming mode. @xref{Faces For Font Lock,,,elisp, GNU Emacs +other programming mode. @xref{Faces for Font Lock,,,elisp, GNU Emacs Lisp Reference Manual}. The following faces are, however, used in a non-standard fashion in diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index fa35aa45984..3756f1ecc5c 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -233,7 +233,7 @@ read an online tutorial by starting GNU Emacs and typing @kbd{C-h t} @cite{GNU Emacs Manual}, @end iftex @ifinfo -@ref{top, , GNU Emacs Manual, emacs, GNU Emacs Manual}, +@ref{Top, , GNU Emacs Manual, emacs, GNU Emacs Manual}, @end ifinfo @ifhtml @uref{http://www.gnu.org/software/emacs/manual/html_node/, diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 42b1624aa0a..dff85373cc1 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -138,7 +138,7 @@ Given a parsed URI, this function returns the corresponding URI string. The return value of @code{url-generic-parse-url}, and the argument expected by @code{url-recreate-url}, is a @dfn{parsed URI}: a CL structure whose slots hold the various components of the URI@. -@xref{top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for +@xref{Top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for details about CL structures. Most of the other functions in the @code{url} library act on parsed URIs. From 208dee4daaae38f870322142388c43cff848e452 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Jul 2013 20:13:07 -0700 Subject: [PATCH 5/5] * lisp/subr.el (y-or-n-p): Handle empty prompts. Fixes: debbugs:14770 --- lisp/ChangeLog | 4 ++++ lisp/subr.el | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2204d474be9..1cf0d190130 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-07-03 Glenn Morris + + * subr.el (y-or-n-p): Handle empty prompts. (Bug#14770) + 2013-05-26 Fabián Ezequiel Gallina * progmodes/python.el (python-indent-block-enders): Add break, diff --git a/lisp/subr.el b/lisp/subr.el index 88f27c75764..0434e3856f9 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2352,7 +2352,8 @@ is nil and `use-dialog-box' is non-nil." (cond (noninteractive (setq prompt (concat prompt - (if (eq ?\s (aref prompt (1- (length prompt)))) + (if (or (zerop (length prompt)) + (eq ?\s (aref prompt (1- (length prompt))))) "" " ") "(y or n) ")) (let ((temp-prompt prompt)) @@ -2369,7 +2370,8 @@ is nil and `use-dialog-box' is non-nil." (x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip))))) (t (setq prompt (concat prompt - (if (eq ?\s (aref prompt (1- (length prompt)))) + (if (or (zerop (length prompt)) + (eq ?\s (aref prompt (1- (length prompt))))) "" " ") "(y or n) ")) (while