[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113268: Merge from emacs-24; up to r111368
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r113268: Merge from emacs-24; up to r111368 |
Date: |
Wed, 03 Jul 2013 03:20:51 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113268 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-02 20:20:04 -0700
message:
Merge from emacs-24; up to r111368
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/emacs/help.texi help.texi-20091113204419-o5vbwnq5f7feedwu-6256
doc/emacs/maintaining.texi
maintaining.texi-20091113204419-o5vbwnq5f7feedwu-6262
doc/emacs/programs.texi
programs.texi-20091113204419-o5vbwnq5f7feedwu-6272
doc/lispintro/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6128
doc/lispintro/emacs-lisp-intro.texi
emacslispintro.texi-20091113204419-o5vbwnq5f7feedwu-6143
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/lispref/debugging.texi
debugging.texi-20091113204419-o5vbwnq5f7feedwu-6171
doc/lispref/files.texi files.texi-20091113204419-o5vbwnq5f7feedwu-6179
doc/lispref/package.texi package.texi-20100825202226-iq7hwjiir2jpyd4g-1
doc/lispref/syntax.texi
syntax.texi-20091113204419-o5vbwnq5f7feedwu-6214
doc/misc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6331
doc/misc/bovine.texi bovine.texi-20121213041604-7ylypfkjfzwpfp48-1
doc/misc/cc-mode.texi
ccmode.texi-20091113204419-o5vbwnq5f7feedwu-6291
doc/misc/mh-e.texi mhe.texi-20091113204419-o5vbwnq5f7feedwu-6311
doc/misc/url.texi url.texi-20091113204419-o5vbwnq5f7feedwu-6326
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/subr.el subr.el-20091113204419-o5vbwnq5f7feedwu-151
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-07-02 16:56:29 +0000
+++ b/ChangeLog 2013-07-03 03:20:04 +0000
@@ -1,3 +1,8 @@
+2013-07-03 Christoph Egger <address@hidden> (tiny change)
+
+ * configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang.
+ http://bugs.debian.org/712974
+
2013-07-02 Paul Eggert <address@hidden>
Remove some unused macros from 'configure'.
=== modified file 'configure.ac'
--- a/configure.ac 2013-07-02 16:56:29 +0000
+++ b/configure.ac 2013-07-03 03:20:04 +0000
@@ -3762,7 +3762,7 @@
case $opsys in
dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
- hpux* | irix6-5 | openbsd | sol2* | unixware )
+ hpux* | irix6-5 | openbsd | sol2* | unixware | gnu-kfreebsd )
emacs_broken_SIGIO=yes
;;
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2013-06-29 13:36:19 +0000
+++ b/doc/emacs/ChangeLog 2013-07-03 03:20:04 +0000
@@ -1,3 +1,11 @@
+2013-07-03 Glenn Morris <address@hidden>
+
+ * maintaining.texi (EDE): Fix cross-reference.
+
+ * programs.texi (Program Modes): Fix emacs-xtra reference.
+
+ * help.texi (Misc Help): Index describe-syntax.
+
2013-06-29 Eli Zaretskii <address@hidden>
* basic.texi (Moving Point): Document visual-order-cursor-movement
=== modified file 'doc/emacs/help.texi'
--- a/doc/emacs/help.texi 2013-01-07 22:00:55 +0000
+++ b/doc/emacs/help.texi 2013-07-03 03:20:04 +0000
@@ -535,6 +535,8 @@
@kindex C-h b
@findex describe-bindings
address@hidden C-h s
address@hidden 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
=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi 2013-06-11 06:42:15 +0000
+++ b/doc/emacs/maintaining.texi 2013-07-03 03:20:04 +0000
@@ -2346,7 +2346,7 @@
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,
=== modified file 'doc/emacs/programs.texi'
--- a/doc/emacs/programs.texi 2013-05-23 19:12:10 +0000
+++ b/doc/emacs/programs.texi 2013-07-02 07:42:34 +0000
@@ -119,17 +119,17 @@
For instance, entering C mode runs the hooks @code{prog-mode-hook} and
@code{c-mode-hook}. @xref{Hooks}, for information about hooks.
address@hidden
address@hidden
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}).
address@hidden ifinfo
address@hidden
address@hidden ifnottex
address@hidden
The Emacs distribution contains Info manuals for the major modes for
Ada, C/C++/Objective C/Java/Corba IDL/Pike/AWK, and address@hidden For
Fortran mode, @pxref{Fortran,,, emacs-xtra, Specialized Emacs Features}.
address@hidden ifnotinfo
address@hidden iftex
@node Defuns
@section Top-Level Definitions, or Defuns
=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog 2013-06-19 20:10:57 +0000
+++ b/doc/lispintro/ChangeLog 2013-07-03 03:20:04 +0000
@@ -1,3 +1,7 @@
+2013-07-03 Glenn Morris <address@hidden>
+
+ * emacs-lisp-intro.texi (edebug): Fix cross-references.
+
2013-06-19 Glenn Morris <address@hidden>
* Makefile.in (dist): Edit more configure variables. (Bug#14660)
=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi 2013-06-21 02:17:37 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi 2013-07-03 03:20:04 +0000
@@ -18483,7 +18483,7 @@
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
@@ -18610,7 +18610,7 @@
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
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2013-06-29 13:36:19 +0000
+++ b/doc/lispref/ChangeLog 2013-07-03 03:20:04 +0000
@@ -1,3 +1,12 @@
+2013-07-03 Glenn Morris <address@hidden>
+
+ * debugging.texi (Debugging):
+ * files.texi (File Attributes, Changing Files): Fix cross-references.
+
+ * package.texi (Package Archives): Fix @url call.
+
+ * syntax.texi (Syntax Table Functions): Mention describe-syntax.
+
2013-06-29 Eli Zaretskii <address@hidden>
* display.texi (Bidirectional Display): Document move-point-visually.
=== modified file 'doc/lispref/debugging.texi'
--- a/doc/lispref/debugging.texi 2013-01-01 09:11:05 +0000
+++ b/doc/lispref/debugging.texi 2013-07-03 03:03:47 +0000
@@ -32,7 +32,7 @@
@item
You can use the ERT package to write regression tests for the program.
address@hidden,the ERT manual,, ERT, ERT: Emacs Lisp Regression Testing}.
address@hidden,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.
=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi 2013-06-11 11:37:56 +0000
+++ b/doc/lispref/files.texi 2013-07-03 03:20:04 +0000
@@ -1115,7 +1115,7 @@
symbolic links in @var{filename} at all levels. If @var{filename}
does not exist, the return value is @code{nil}.
address@hidden Permissions,,, coreutils, The @sc{gnu} @code{Coreutils}
address@hidden 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
@@ -1625,7 +1625,7 @@
@noindent
specifies that the file should be readable and writable for its owner,
readable for group members, and readable for all other users.
address@hidden Permissions,,, coreutils, The @sc{gnu} @code{Coreutils}
address@hidden permissions,,, coreutils, The @sc{gnu} @code{Coreutils}
Manual}, for a description of mode bit specifications.
Interactively, @var{mode} is read from the minibuffer using
@@ -1676,7 +1676,7 @@
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
address@hidden"u+r,g+rx,o+r,g-w"}. @xref{File Permissions,,, coreutils, The
address@hidden"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
=== modified file 'doc/lispref/package.texi'
--- a/doc/lispref/package.texi 2013-01-01 09:11:05 +0000
+++ b/doc/lispref/package.texi 2013-07-03 03:03:47 +0000
@@ -265,7 +265,7 @@
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
=== modified file 'doc/lispref/syntax.texi'
--- a/doc/lispref/syntax.texi 2013-01-03 02:23:39 +0000
+++ b/doc/lispref/syntax.texi 2013-06-26 07:16:20 +0000
@@ -506,6 +506,11 @@
the current buffer.
@end defun
address@hidden Command describe-syntax &optional buffer
+This command displays the contents of the syntax table of
address@hidden (by default, the current buffer) in a help buffer.
address@hidden deffn
+
@defmac with-syntax-table table address@hidden
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
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2013-07-02 10:38:58 +0000
+++ b/doc/misc/ChangeLog 2013-07-03 03:20:04 +0000
@@ -1,3 +1,10 @@
+2013-07-03 Glenn Morris <address@hidden>
+
+ * 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-07-02 Lars Magne Ingebrigtsen <address@hidden>
* gnus.texi (Client-Side IMAP Splitting):
=== modified file 'doc/misc/bovine.texi'
--- a/doc/misc/bovine.texi 2013-02-12 17:36:54 +0000
+++ b/doc/misc/bovine.texi 2013-07-03 03:03:47 +0000
@@ -76,7 +76,7 @@
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}
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2013-03-06 14:24:39 +0000
+++ b/doc/misc/cc-mode.texi 2013-07-03 03:20:04 +0000
@@ -2111,7 +2111,7 @@
@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
=== modified file 'doc/misc/mh-e.texi'
--- a/doc/misc/mh-e.texi 2013-03-04 08:45:03 +0000
+++ b/doc/misc/mh-e.texi 2013-07-03 03:20:04 +0000
@@ -233,7 +233,7 @@
@cite{GNU Emacs Manual},
@end iftex
@ifinfo
address@hidden, , GNU Emacs Manual, emacs, GNU Emacs Manual},
address@hidden, , GNU Emacs Manual, emacs, GNU Emacs Manual},
@end ifinfo
@ifhtml
@uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/,
=== modified file 'doc/misc/url.texi'
--- a/doc/misc/url.texi 2013-02-13 04:31:09 +0000
+++ b/doc/misc/url.texi 2013-07-03 03:20:04 +0000
@@ -138,7 +138,7 @@
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 address@hidden
address@hidden,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
address@hidden,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.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-07-03 03:09:38 +0000
+++ b/lisp/ChangeLog 2013-07-03 03:20:04 +0000
@@ -1,5 +1,7 @@
2013-07-03 Glenn Morris <address@hidden>
+ * subr.el (y-or-n-p): Handle empty prompts. (Bug#14770)
+
Make info-xref checks case-sensitive by default
* info.el (Info-find-node, Info-find-in-tag-table)
(Info-find-node-in-buffer, Info-find-node-2, Info-goto-node):
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2013-06-20 14:15:42 +0000
+++ b/lisp/subr.el 2013-07-03 03:20:04 +0000
@@ -2240,7 +2240,8 @@
(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))
@@ -2257,7 +2258,8 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113268: Merge from emacs-24; up to r111368,
Glenn Morris <=