[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108549: Merge from emacs-24; up to r
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108549: Merge from emacs-24; up to r108032 |
Date: |
Sun, 10 Jun 2012 21:21:29 +0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108549 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-06-10 21:21:29 +0800
message:
Merge from emacs-24; up to r108032
modified:
doc/misc/ChangeLog
doc/misc/sc.texi
etc/AUTHORS
lisp/ChangeLog
lisp/allout-widgets.el
lisp/cus-edit.el
lisp/mail/rmail.el
src/dispextern.h
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2012-06-08 00:03:10 +0000
+++ b/doc/misc/ChangeLog 2012-06-10 13:20:58 +0000
@@ -1,3 +1,8 @@
+2012-06-10 Chong Yidong <address@hidden>
+
+ * sc.texi: Remove bogus @ifinfo commands which prevent makeinfo
+ compilation for html-mono.
+
2012-06-08 Paul Eggert <address@hidden>
* texinfo.tex: Merge from gnulib.
=== modified file 'doc/misc/sc.texi'
--- a/doc/misc/sc.texi 2012-05-28 23:28:27 +0000
+++ b/doc/misc/sc.texi 2012-06-10 13:20:58 +0000
@@ -95,13 +95,11 @@
The preferred way to spell Supercite is with a capital @samp{S},
lowercase @samp{upercite}.
address@hidden
@menu
* Usage Overview::
* What Supercite Does Not Do::
* What Supercite Does::
@end menu
address@hidden ifinfo
@cindex MUA
@cindex NUA
@@ -242,12 +240,10 @@
And that's what I think too.
@end example
address@hidden
@menu
* Citation Elements::
* Recognizing Citations::
@end menu
address@hidden ifinfo
Note that multiple inclusions of the original messages result in a
nesting of the @address@hidden>}} characters. This can sometimes be quite
@@ -506,12 +502,10 @@
information contained in the info alist can be inserted into a reference
header.
address@hidden
@menu
* The Built-in Header Rewrite Functions::
* Electric References::
@end menu
address@hidden ifinfo
@cindex header rewrite functions
@vindex sc-rewrite-header-list
@@ -791,7 +785,6 @@
@node Replying and Yanking
@chapter Replying and Yanking
address@hidden
This chapter explains what happens when you reply and yank an original
message from an MUA.
@@ -800,7 +793,7 @@
* Reply Buffer Initialization::
* Filling Cited Text::
@end menu
address@hidden ifinfo
+
@node Reply Buffer Initialization
@section Reply Buffer Initialization
@findex sc-cite-original
@@ -1053,13 +1046,11 @@
information as the author's first name, middle names, and last name, the
author's initials, and the author's email terminus.
address@hidden
@menu
* Attribution Preferences::
* Anonymous Attributions::
* Author Names::
@end menu
address@hidden ifinfo
@node Attribution Preferences
@section Attribution Preferences
@@ -1331,12 +1322,10 @@
throughout Supercite, from mail header information extraction, to header
nuking, to citing text.
address@hidden
@menu
* Using Regi::
* Frames You Can Customize::
@end menu
address@hidden ifinfo
While the details of Regi are discussed below (@pxref{Using Regi}), only
those who wish to customize certain aspects of Supercite need concern
@@ -1534,7 +1523,6 @@
chapter, we'll assume you've installed Supercite's keymap on the default
address@hidden
address@hidden
@menu
* Citing Commands::
* Insertion Commands::
@@ -1542,7 +1530,6 @@
* Mail Field Commands::
* Miscellaneous Commands::
@end menu
address@hidden ifinfo
@node Citing Commands
@section Commands to Manually Cite, Recite, and Uncite
@@ -1909,9 +1896,7 @@
@node Command Index
@unnumbered Command Index
address@hidden
address@hidden ifinfo
Since all supercite commands are prepended with the string
address@hidden'', each appears under its @address@hidden name and
its @var{command} name.
@@ -1926,9 +1911,7 @@
@node Variable Index
@unnumbered Variable Index
address@hidden
address@hidden ifinfo
Since all supercite variables are prepended with the string
address@hidden'', each appears under its @address@hidden name and
its @var{variable} name.
=== modified file 'etc/AUTHORS'
--- a/etc/AUTHORS 2012-05-27 01:06:44 +0000
+++ b/etc/AUTHORS 2012-06-10 13:20:58 +0000
@@ -1134,8 +1134,8 @@
and co-wrote ob-R.el ob-clojure.el ob-exp.el ob-fortran.el ob-lisp.el
ob-lob.el ob-maxima.el ob-perl.el ob-picolisp.el ob-python.el ob-ref.el
ob.el org-bibtex.el
-and changed org.texi org.el org-exp.el org-latex.el org-src.el
- ob-plantuml.el org-table.el org-agenda.el org-macs.el orgcard.tex
+and changed org.texi org.el org-exp.el org-latex.el ob-plantuml.el
+ org-src.el org-table.el org-agenda.el org-macs.el orgcard.tex
ob-lilypond.el ob-mscgen.el ob-octave.el ob-screen.el org-ascii.el
org-footnote.el org-html.el org-mouse.el gnus-art.el ob-ledger.el
ob-matlab.el and 5 other files
@@ -2035,8 +2035,8 @@
Keith Packard: changed font.c
Ken Brown: changed configure.in cygwin.h sheap.c browse-url.el gmalloc.c
- vm-limit.c dired.c emacs.c fileio.c gdb-mi.el loadup.el mem-limits.h
- unexcw.c
+ vm-limit.c callproc.c dired.c emacs.c fileio.c gdb-mi.el loadup.el
+ mem-limits.h unexcw.c
Ken Brush: changed emacsclient.c
@@ -2373,6 +2373,8 @@
Mark Plaksin: changed nnrss.el term.el
+Mark Shoulson: changed org.el
+
Mark Thomas: changed flow-fill.el gnus-sum.el gnus-util.el nnmail.el
Mark Triggs: changed nnir.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-06-09 17:03:43 +0000
+++ b/lisp/ChangeLog 2012-06-10 13:20:58 +0000
@@ -1,3 +1,17 @@
+2012-06-10 Glenn Morris <address@hidden>
+
+ * mail/rmail.el (rmail-yank-current-message): Leave point at
+ correct position. (Bug#11660)
+
+2012-06-10 Chong Yidong <address@hidden>
+
+ * allout-widgets.el: Fix code header.
+
+2012-06-10 Chong Yidong <address@hidden>
+
+ * cus-edit.el (customize-changed-options-previous-release): Bump
+ to 24.1.
+
2012-06-09 Andreas Schwab <address@hidden>
* Makefile.in (BIG_STACK_DEPTH): Enlarge to 2200.
=== modified file 'lisp/allout-widgets.el'
--- a/lisp/allout-widgets.el 2012-05-02 10:57:03 +0000
+++ b/lisp/allout-widgets.el 2012-06-10 13:20:58 +0000
@@ -64,7 +64,7 @@
;; systematically couple overlays, graphics, and other features with
;; allout-governed text.
-;;;_: Code (structured with comments that delineate an allout outline)
+;;; Code:
;;;_ : General Environment
(require 'allout)
=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el 2012-06-08 16:39:49 +0000
+++ b/lisp/cus-edit.el 2012-06-10 13:20:58 +0000
@@ -1159,7 +1159,7 @@
(unless (eq symbol basevar)
(message "`%s' is an alias for `%s'" symbol basevar))))
-(defvar customize-changed-options-previous-release "23.1"
+(defvar customize-changed-options-previous-release "24.1"
"Version for `customize-changed-options' to refer back to by default.")
;; Packages will update this variable, so make it available.
=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el 2012-05-24 07:20:34 +0000
+++ b/lisp/mail/rmail.el 2012-06-10 13:20:58 +0000
@@ -3589,7 +3589,7 @@
(with-current-buffer buffer
(unless (rmail-buffers-swapped-p)
(setq buffer rmail-view-buffer)))
- (insert-buffer buffer)
+ (insert-buffer-substring buffer)
;; If they yank the text of BUFFER, the encoding of BUFFER is a
;; better default for the reply message than the default value of
;; buffer-file-coding-system.
=== modified file 'src/dispextern.h'
--- a/src/dispextern.h 2012-06-09 16:44:44 +0000
+++ b/src/dispextern.h 2012-06-10 13:20:58 +0000
@@ -2205,7 +2205,11 @@
struct display_pos current;
/* Total number of overlay strings to process. This can be >
- OVERLAY_STRING_CHUNK_SIZE. */
+ OVERLAY_STRING_CHUNK_SIZE. Value is dependable only when
+ current.overlay_string_index >= 0. Use the latter to determine
+ whether an overlay string is being iterated over, because
+ n_overlay_strings can be positive even when we are not rendering
+ an overlay string. */
ptrdiff_t n_overlay_strings;
/* The charpos where n_overlay_strings was calculated. This should
@@ -2224,7 +2228,8 @@
/* If non-nil, a Lisp string being processed. If
current.overlay_string_index >= 0, this is an overlay string from
- pos. */
+ pos. Use STRINGP (it.string) to test whether we are rendering a
+ string or something else; do NOT use BUFFERP (it.object). */
Lisp_Object string;
/* If non-nil, we are processing a string that came
@@ -2413,6 +2418,9 @@
and continuation glyphs, or blanks that extend each line to the
edge of the window on a TTY.
+ Do NOT use !BUFFERP (it.object) as a test whether we are
+ iterating over a string; use STRINGP (it.string) instead.
+
Position is the current iterator position in object. */
Lisp_Object object;
struct text_pos position;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108549: Merge from emacs-24; up to r108032,
Chong Yidong <=