[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118169: Merge from emacs-24
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] trunk r118169: Merge from emacs-24 |
|
Date: |
Tue, 21 Oct 2014 01:17:34 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118169 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2014-10-20 21:17:06 -0400
message:
Merge from emacs-24
renamed:
lisp/progmodes/cc-compat.el => lisp/obsolete/cc-compat.el
cccompat.el-20091113204419-o5vbwnq5f7feedwu-1225
modified:
admin/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2226
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/lispintro/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6128
doc/misc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6331
etc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1485
lib-src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1608
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/cedet/ChangeLog changelog-20100919015713-3rbr456yray5m84f-1
lisp/gnus/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1433
lisp/mh-e/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2547
lisp/org/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8688
lisp/url/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-3116
oldXMenu/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1572
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
lisp/obsolete/cc-compat.el
cccompat.el-20091113204419-o5vbwnq5f7feedwu-1225
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/admin/ChangeLog 2014-10-21 01:17:06 +0000
@@ -89,7 +89,7 @@
* notes/copyright: Remove mention of msdos/is_exec.c and
sigaction.c.
- * authors.el (authors-renamed-files-alist): Removed is_exec.c.
+ * authors.el (authors-renamed-files-alist): Remove is_exec.c.
2014-08-07 Reuben Thomas <address@hidden>
@@ -2039,7 +2039,7 @@
2006-04-17 Ramprasad B <address@hidden>
- * ./* (Copyright): Updated Copyright year(s).
+ * ./* (Copyright): Update Copyright year(s).
2006-02-24 Reiner Steib <address@hidden>
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/doc/emacs/ChangeLog 2014-10-21 01:17:06 +0000
@@ -307,8 +307,8 @@
2014-03-13 Paul Eggert <address@hidden>
- * mule.texi (International, Language Environments): Update
- the list of language environments to what Emacs currently
+ * mule.texi (International, Language Environments):
+ Update the list of language environments to what Emacs currently
supports. Add the full list to the index. Suggest C-h L for
details rather than trying to give very brief details here.
@@ -600,8 +600,8 @@
* indent.texi (Tab Stops): Mention recent changes about `tab-stop-list'.
- * frames.texi (Scroll Bars): Document
- `scroll-bar-adjust-thumb-portion'.
+ * frames.texi (Scroll Bars):
+ Document `scroll-bar-adjust-thumb-portion'.
2013-12-21 Chong Yidong <address@hidden>
@@ -627,8 +627,8 @@
* entering.texi: Document `initial-buffer-choice' changes.
- * misc.texi (emacsclient Options): Document
- `initial-buffer-choice' changes.
+ * misc.texi (emacsclient Options):
+ Document `initial-buffer-choice' changes.
* help.texi: Document that `?' now also shows subcommands of
prefix keys.
@@ -1111,8 +1111,8 @@
* misc.texi (Terminal emulator): Document Term mode faces.
- * mini.texi (Basic Minibuffer): New node. Document
- minibuffer-electric-default-mode.
+ * mini.texi (Basic Minibuffer): New node.
+ Document minibuffer-electric-default-mode.
* display.texi (Visual Line Mode): Fix index entry.
@@ -3172,7 +3172,7 @@
* Makefile.in (MAKEINFO): Now controlled by `configure'.
(MAKEINFO_OPTS): New variable. Use it where appropriate.
- (ENVADD): Updated.
+ (ENVADD): Update.
2011-01-18 Glenn Morris <address@hidden>
@@ -9067,7 +9067,7 @@
* text.texi (Format Faces): Replace old M-g key prefix with M-o.
- * emacs.texi (Acknowledgments): Updated.
+ * emacs.texi (Acknowledgments): Update.
* anti.texi: Total rewrite.
=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/doc/lispintro/ChangeLog 2014-10-21 01:17:06 +0000
@@ -575,8 +575,8 @@
2006-11-05 Robert J. Chassell <address@hidden>
* emacs-lisp-intro.texi: Yet more minor changes:
- (defcustom): Said that `:options' is usually for a hook. Remove
- extraneous space in parenthetical remark concerning
+ (defcustom): Said that `:options' is usually for a hook.
+ Remove extraneous space in parenthetical remark concerning
`text-mode-hook-identify'. At end, mention other defines, too.
(Beginning a .emacs File): Reverse words about comments so they
parallel numbers of listed semi-colons.
@@ -598,12 +598,12 @@
Center images for TeX output.
(kill-new function): Remove indentation for sentence talking about
momentarily skipping code.
- (cons & search-fwd Review): Document @code{funcall}. Document
- @code{re-search-forward} with existing @code{search-forward}.
+ (cons & search-fwd Review): Document @code{funcall}.
+ Document @code{re-search-forward} with existing @code{search-forward}.
Reference chapter on regular expression searches.
(Recursion with list): Specify a more recent version as being Emacs.
- (Recursion with list, Every, recursive-graph-body-print): Change
- `if ... progn' expression to `when'.
+ (Recursion with list, Every, recursive-graph-body-print):
+ Change `if ... progn' expression to `when'.
(Recursive triangle function): For printing in small book, ensure
section name is not last on bottom of preceding page.
(Keep): Remove extraneous space in function definition example.
@@ -612,11 +612,11 @@
function.
(fwd-sentence while loops): Write a function as one, not as a form.
(fwd-para let): Add `which' to sentence with `parstart' and `parsep'.
- (etags): Move sentences involving `find-tag' and sources. State
- location of Emacs `src' directory.
+ (etags): Move sentences involving `find-tag' and sources.
+ State location of Emacs `src' directory.
(Design count-words-region): Better explain two backslashes in a row.
- (Find a File): Fix grammar; add a `to' and write `to visit'. Change
- `named' to `selected'.
+ (Find a File): Fix grammar; add a `to' and write `to visit'.
+ Change `named' to `selected'.
(lengths-list-file): Remove extraneous parenthesis from reference.
(lengths-list-many-files): Explain `expand-file-name' better.
(Files List): Rephrase sentence regarding Lisp sources directory.
@@ -644,8 +644,8 @@
seen' the @code{eq} function.
(kill-append function): Reformat `kill-append' function definition so
it prints well.
- (kill-new function): Indent the sentence beginning `notice'. Replace
- `the same as' with `similar to'. Repair typo. Remove obsolete
+ (kill-new function): Indent the sentence beginning `notice'.
+ Replace `the same as' with `similar to'. Repair typo. Remove obsolete
references to `yank' and `yank-pop. End section with a note that `we
will digress into C.'
@@ -669,8 +669,8 @@
is 3.00. Did not update ISBN number.
* emacs-lisp-intro.texi: Remove version reference for X colors.
- Document `='. Remove mention that :eval was new in 21. Updated
- instance's edition-number to 3.01.
+ Document `='. Remove mention that :eval was new in 21.
+ Updated instance's edition-number to 3.01.
2006-10-30 Robert J. Chassell <address@hidden>
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/doc/misc/ChangeLog 2014-10-21 01:17:06 +0000
@@ -57,8 +57,8 @@
2014-09-24 Ulf Jasper <address@hidden>
* newsticker.texi: Reworked. Document new treeview group
- commands. Remove VERSION, UPDATED, use EMACSVER instead. Use
- term 'feed reader'.
+ commands. Remove VERSION, UPDATED, use EMACSVER instead.
+ Use term 'feed reader'.
2014-09-04 Paul Eggert <address@hidden>
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/etc/ChangeLog 2014-10-21 01:17:06 +0000
@@ -3875,7 +3875,7 @@
* orgcard.tex (section{Motion}): Add the item navigation commands.
(section{Publishing}): New section.
- (section{Links}): Documented elisp and shell links.
+ (section{Links}): Document elisp and shell links.
2006-05-20 Rodrigo Real <address@hidden>
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/lib-src/ChangeLog 2014-10-21 01:17:06 +0000
@@ -7739,7 +7739,7 @@
(consider_token): DEFUNs now treated like funcs in ctags mode.
* etags.c (LEVEL_OK_FOR_FUNCDEF): Remove.
- (C_entries): Optimized the test that used LEVEL_OK_FOR_FUNCDEF.
+ (C_entries): Optimize the test that used LEVEL_OK_FOR_FUNCDEF.
(C_entries): Remove a piece of useless code.
(C_entries): Making typedef tags is delayed until a semicolon
is met. This handles "typedef int X, Y, Z;" correctly.
@@ -8139,7 +8139,7 @@
* Makefile.in (prefix, bindir, libdir, srcdir): New variables, as
described in the top-level Makefile.
(UTILITIES): Add make-path to the list of utility programs.
- (../arch-lib): Replaced by the ${archlibdir} target, which places
+ (../arch-lib): Replace by the ${archlibdir} target, which places
the executables in their permanent home.
(install, install.sysv, install.xenix): Consolidated into one
target which should work under all circumstances, modulo a few
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/lisp/ChangeLog 2014-10-21 01:17:06 +0000
@@ -1,3 +1,16 @@
+2014-10-21 Stefan Monnier <address@hidden>
+
+ * obsolete/cc-compat.el: Make obsolete (bug#18561).
+
+ * epg-config.el (epg-gpg-program): Don't use absolute names by default.
+
+ * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
+ case (bug#18767).
+
+2014-10-21 Glenn Morris <address@hidden>
+
+ * Merge in all changes up to version 24.4 release.
+
2014-10-20 Stefan Monnier <address@hidden>
* emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/lisp/cedet/ChangeLog 2014-10-21 01:17:06 +0000
@@ -20,7 +20,8 @@
* semantic/ia.el (semantic-ia-complete-symbol-menu): Use posn-at-point
instead of senator-completion-menu-point-as-event; un-comment, tho keep
- the "no smart completion" fallback commented since it still doesn't
work.
+ the "no smart completion" fallback commented since it still doesn't
+ work.
2014-05-01 Glenn Morris <address@hidden>
@@ -83,8 +84,8 @@
structure tags are not analyzed correctly. Also, always search
the extended miniscope even when not dealing with types.
- * semantic/ctxt.el (semantic-get-local-variables-default): Also
- try to parse local variables for buffers which are currently
+ * semantic/ctxt.el (semantic-get-local-variables-default):
+ Also try to parse local variables for buffers which are currently
marked as unparseable. Otherwise, it is often impossible to
complete local variables.
@@ -125,8 +126,8 @@
(semantic-cpp-lexer): Use new `semantic-lex-spp-paren-or-list'.
* semantic/bovine/gcc.el (semantic-gcc-setup): Add 'features.h' to
- the list of files whose preprocessor symbols are included. This
- pulls in things like __USE_POSIX and similar.
+ the list of files whose preprocessor symbols are included.
+ This pulls in things like __USE_POSIX and similar.
* semantic/format.el (semantic-format-tag-prototype-default):
Display default values if available.
@@ -135,11 +136,11 @@
(semantic-analyze-refs-proto): Add 'default-value' as ignorable in
call to `semantic-tag-similar-p'.
- * semantic/db-mode.el (semanticdb-semantic-init-hook-fcn): Always
- set buffer for `semanticdb-current-table'.
+ * semantic/db-mode.el (semanticdb-semantic-init-hook-fcn):
+ Always set buffer for `semanticdb-current-table'.
- * semantic/db.el (semanticdb-table::semanticdb-refresh-table): The
- previous change turned up a bug in this method. Since the current
+ * semantic/db.el (semanticdb-table::semanticdb-refresh-table):
+ The previous change turned up a bug in this method. Since the current
table now correctly has a buffer set, the first clause in the
`cond' would be taken, but there was a `save-excursion' missing.
@@ -163,8 +164,8 @@
impossible to find project includes.
* semantic/decorate/include.el
- (semantic-decoration-on-includes-highlight-default): Remove
- 'unloaded' from throttle when decorating includes, otherwise all
+ (semantic-decoration-on-includes-highlight-default):
+ Remove 'unloaded' from throttle when decorating includes, otherwise all
would be loaded. Rename 'table' to 'currenttable' to make things
clearer.
@@ -179,7 +180,7 @@
architecture).
(ede-linux--get-build-directory, ede-linux--get-archs)
(ede-linux--detect-architecture, ede-linux--get-architecture)
- (ede-linux--include-path): Added function to detect Linux-specific
+ (ede-linux--include-path): Add function to detect Linux-specific
information.
(ede-linux-load): Set new Linux-specific information when creating
a project.
@@ -197,8 +198,8 @@
* ede/generic.el (project-run-target): Remove incorrect require.
- * semantic/format.el (semantic-format-tag-prototype-default): Use
- concat only for strings.
+ * semantic/format.el (semantic-format-tag-prototype-default):
+ Use concat only for strings.
2013-11-30 Glenn Morris <address@hidden>
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/lisp/gnus/ChangeLog 2014-10-21 01:17:06 +0000
@@ -9,10 +9,10 @@
2014-10-15 Sylvain Chouleur <address@hidden>
- * gnus-icalendar.el: Support vcal format timezones
- (gnus-icalendar-event--decode-datefield): use icalendar functions to
- compute dates with associated timezone
- (gnus-icalendar-event-from-ical): compute all timezones
+ * gnus-icalendar.el: Support vcal format timezones.
+ (gnus-icalendar-event--decode-datefield): Use icalendar functions to
+ compute dates with associated timezone.
+ (gnus-icalendar-event-from-ical): Compute all timezones.
2014-10-14 Teodor Zlatanov <address@hidden>
@@ -24290,10 +24290,10 @@
* gnus-group.el: Require gnus-sum and autoload functions to
resolve warnings when gnus-group.el compiled alone.
- (gnus-group-line-format): Documented new %F.
+ (gnus-group-line-format): Document new %F.
(size of Fetched data) group line format; identifies disk space
used by agent and cache.
- (gnus-group-line-format-alist): Defined new F format.
+ (gnus-group-line-format-alist): Define new F format.
(gnus-total-fetched-for): New function.
(gnus-group-delete-group): No longer update
gnus-cache-active-altered as gnus-request-delete-group now keeps
=== modified file 'lisp/mh-e/ChangeLog'
--- a/lisp/mh-e/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/lisp/mh-e/ChangeLog 2014-10-21 01:17:06 +0000
@@ -14,8 +14,8 @@
string before trying to use it (closes SF #474).
(mh-bare-components): New function to create a temporary initial
components file; replaces mh-find-components. Improve the temp
- folder and file names as per a suggestion from Bill Wohler. Also
- address XEmacs compatibility issues: use mm-make-temp-file instead
+ folder and file names as per a suggestion from Bill Wohler.
+ Also address XEmacs compatibility issues: use mm-make-temp-file instead
of make-temp-file, and only pass one argument to delete-directory.
(mh-edit-again, mh-send-sub): Use mh-bare-components instead of
mh-find-components (partially closes SF #468).
@@ -103,8 +103,8 @@
* mh-letter.el (mh-yank-hooks): Use new mh-make-obsolete-variable
macro.
- * mh-e.el (mh-kill-folder-suppress-prompt-hooks): Use
- new mh-define-obsolete-variable-alias macro.
+ * mh-e.el (mh-kill-folder-suppress-prompt-hooks):
+ Use new mh-define-obsolete-variable-alias macro.
* mh-compat.el (mh-cl-flet): New alias for cl-flet on Emacs 24 and
flet elsewhere.
@@ -116,8 +116,8 @@
Replace flet with new alias mh-cl-flet.
* mh-mime.el (mh-display-with-external-viewer, mh-mime-display)
- (mh-press-button, mh-push-button, mh-display-emphasis): Replace
- flet with new alias mh-cl-flet.
+ (mh-press-button, mh-push-button, mh-display-emphasis):
+ Replace flet with new alias mh-cl-flet.
* mh-e.el (mh-invisible-header-fields-internal):
Remove trailing whitespace.
@@ -159,16 +159,16 @@
(mh-folder-mode): Add mh-blacklist and mh-whitelist variables.
(mh-execute-commands): Update documentation.
(mh-undo, mh-outstanding-commands-p, mh-process-commands)
- (mh-delete-a-msg, mh-refile-a-msg, mh-undo-msg): Handle
- blacklisted and whitelisted messages.
+ (mh-delete-a-msg, mh-refile-a-msg, mh-undo-msg):
+ Handle blacklisted and whitelisted messages.
* mh-junk.el (mh-junk-blacklist, mh-junk-whitelist): Update to put
messages in blacklist and whitelist respectively for latter
processing.
(mh-blacklist-a-msg, mh-junk-whitelist-a-msg): New function to
support previous functions.
(mh-junk-blacklist-disposition): New function.
- (mh-junk-process-blacklist, mh-junk-process-whitelist): New
- functions that perform the blacklisting and whitelisting
+ (mh-junk-process-blacklist, mh-junk-process-whitelist):
+ New functions that perform the blacklisting and whitelisting
respectively that used to be performed by mh-junk-blacklist and
mh-junk-whitelist.
* mh-scan.el (mh-scan-blacklisted-msg-regexp)
@@ -191,18 +191,18 @@
X-MaxCode-Template:, X-ME-Bayesian:, X-Sendergroup:, X-SFDC-,
X-SMFBL:, X-SMHeaderMap:, X-VGI-OESCD:, X-VirtualServer:,
X-VirtualServerGroup:, X-XPT-XSL-Name:, X-Y-GMX-Trusted:,
- X-XWALL-, X-ZixNet:. Changed X-Habeas-SWE- to X-Habeas-. Updated
- the comment. (addresses SF #1916032).
+ X-XWALL-, X-ZixNet:. Changed X-Habeas-SWE- to X-Habeas-.
+ Updated the comment. (addresses SF #1916032).
2012-11-25 Bill Wohler <address@hidden>
- * mh-e.el (mh-invisible-header-fields-internal): Add
- X-AnalysisOut, X-Authentication-Info, X-Auto-Response-Suppress,
+ * mh-e.el (mh-invisible-header-fields-internal):
+ Add X-AnalysisOut, X-Authentication-Info, X-Auto-Response-Suppress,
X-Bayes-Prob, X-Cam-, X-CanIt-Geo, X-Completed, X-Facebook,
X-Forwarded-, X-Generated-By, X-Headers-End, X-IEEE-UCE,
X-Jira-Fingerprint, X-Junkmail-, X-Launchpad-, X-MXL-Hash,
- X-Notification-, X-Notifications, X-Oracle-Calendar. Replace
- X-DCC-Usenix-Metrics with X-DCC- (addresses SF #1916032).
+ X-Notification-, X-Notifications, X-Oracle-Calendar.
+ Replace X-DCC-Usenix-Metrics with X-DCC- (addresses SF #1916032).
2012-11-25 Jeffrey C Honig <address@hidden>
@@ -1260,8 +1260,8 @@
(mh-show-subject, mh-show-to, mh-show-xface)
(mh-speedbar-folder, mh-speedbar-folder-with-unseen-messages)
(mh-speedbar-selected-folder)
- (mh-speedbar-selected-folder-with-unseen-messages): Add
- :package-version keyword to these faces (closes SF #1452724).
+ (mh-speedbar-selected-folder-with-unseen-messages):
+ Add :package-version keyword to these faces (closes SF #1452724).
* mh-tool-bar.el (mh-tool-bar-define): Add commented-out
:package-version keywords (closes SF #1452724).
=== renamed file 'lisp/progmodes/cc-compat.el' => 'lisp/obsolete/cc-compat.el'
--- a/lisp/progmodes/cc-compat.el 2014-01-01 07:43:34 +0000
+++ b/lisp/obsolete/cc-compat.el 2014-10-20 21:55:12 +0000
@@ -8,6 +8,7 @@
;; Created: August 1994, split from cc-mode.el
;; Keywords: c languages
;; Package: cc-mode
+;; Obsolete-Since: 24.5
;; This file is part of GNU Emacs.
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/lisp/org/ChangeLog 2014-10-21 01:17:06 +0000
@@ -4,18 +4,17 @@
2014-10-12 Marco Wahl <address@hidden>
- * org-agenda.el (org-get-entries-from-diary): Use
- `diary-fancy-display' instead of the obsolete
+ * org-agenda.el (org-get-entries-from-diary):
+ Use `diary-fancy-display' instead of the obsolete
`diary-display-hook'.
2014-10-12 Nicolas Goaziou <address@hidden>
- * ox.el (org-export-async-start): Limit first argument to lambda
+ * ox.el (org-export-async-start): Limit first argument to lambda
expressions.
- * ox-publish.el (org-publish, org-publish-all)
- (org-publish-current-file): Replace `ignore', per limit stated
- above.
+ * ox-publish.el (org-publish, org-publish-all)
+ (org-publish-current-file): Replace `ignore', per limit stated above.
2014-10-12 Christopher Schmidt <address@hidden>
@@ -89,8 +88,8 @@
* org-agenda.el (org-agenda-get-sexps): Don't add tags as text
properties.
- * org-capture.el (org-capture-fill-template): Take
- `org-extend-today-until' into account when setting the format time
+ * org-capture.el (org-capture-fill-template):
+ Take `org-extend-today-until' into account when setting the format time
string.
* org.el (org-paste-subtree): Fix match subexpression.
@@ -115,8 +114,8 @@
(org-agenda-tag-filter-while-redo): Delete.
(org-agenda-list, org-agenda-redo, org-agenda-filter-by-tag):
Remove unused code.
- (org-agenda-clockreport-mode, org-agenda-set-mode-name): Don't
- consider tag filters.
+ (org-agenda-clockreport-mode, org-agenda-set-mode-name):
+ Don't consider tag filters.
* org.el (org-fix-ellipsis-at-bol)
(org-first-headline-recenter): Use `set-window-start' instead
@@ -137,8 +136,8 @@
* org.el (org-overview): Don't call `recenter'.
- * org-agenda.el (org-agenda-custom-commands-local-options): Fix
- misquoted values.
+ * org-agenda.el (org-agenda-custom-commands-local-options):
+ Fix misquoted values.
* org.el (org-property-re): Also match null properties by default.
(org-entry-delete): Also delete null properties.
@@ -146,8 +145,8 @@
(org-delete-property): Throw a message when there is not property
to delete.
- * org-agenda.el (org-agenda-insert-diary-make-new-entry): Fix
- docstring.
+ * org-agenda.el (org-agenda-insert-diary-make-new-entry):
+ Fix docstring.
* org.el (org-re-property): New parameter `allow-null' to match
property with a null value.
@@ -174,8 +173,8 @@
`buffer-invisibility-spec'.
* org-agenda.el (org-agenda-mode): Add buffer invisibility specs.
- (org-agenda-filter-hide-line, org-agenda-remove-filter): Set
- the 'invisible text property to 'org-filtered.
+ (org-agenda-filter-hide-line, org-agenda-remove-filter):
+ Set the 'invisible text property to 'org-filtered.
(org-agenda-show-new-time): Add the default face to avoid the
foreground of the last character on the line to leak into the
timestamp notification.
@@ -195,8 +194,8 @@
of `outline-end-of-subtree'.
(outline-end-of-subtree): Remove advice.
- * org-mouse.el (org-mouse-move-tree, org-mouse-do-remotely): Use
- `org-end-of-subtree' instead of `outline-end-of-subtree'.
+ * org-mouse.el (org-mouse-move-tree, org-mouse-do-remotely):
+ Use `org-end-of-subtree' instead of `outline-end-of-subtree'.
* org-agenda.el (org-cmp-ts): Argument `type' is not optional.
Don't quote it.
@@ -204,8 +203,8 @@
* org-habit.el (org-habit-insert-consistency-graphs): Don't remove
filter overlays as we don't use overlays for filters anymore.
- * org-agenda.el (org-agenda-local-vars): Add
- `org-agenda-top-headline-filter'.
+ * org-agenda.el (org-agenda-local-vars):
+ Add `org-agenda-top-headline-filter'.
(org-agenda-filter-by-category): Fix syntax.
(org-agenda-filter-show-all-top-filter): New function.
(org-agenda-filter-by-top-headline)
@@ -246,8 +245,8 @@
* org-table.el (org-table-eval-formula): Fix conversion of
inactive timestamps to active ones.
- * org.el (org-set-regexps-and-options): Allow
- `org-complex-heading-regexp-format' to match [/] and [%] cookies
+ * org.el (org-set-regexps-and-options):
+ Allow `org-complex-heading-regexp-format' to match [/] and [%] cookies
when they are both before and after the heading.
* org-agenda.el (org-agenda-max-todos, org-agenda-max-tags)
@@ -272,8 +271,8 @@
* ob-screen.el (org-babel-screen-test): Use unpredictable name for
temporary file.
- * ob-screen.el (org-babel-screen-session-write-temp-file): Use
- unpredictable temp file name, fixes bug#17416.
+ * ob-screen.el (org-babel-screen-session-write-temp-file):
+ Use unpredictable temp file name, fixes bug#17416.
2014-10-03 Ian Kelling <address@hidden>
@@ -367,8 +366,8 @@
* org-agenda.el (org-agenda-write): Write headings in proper
order.
- * org-element.el (org-element-table-interpreter): Enhance
- docstring.
+ * org-element.el (org-element-table-interpreter):
+ Enhance docstring.
* ox-md.el (org-md-link): Allow custom link type export function.
@@ -390,8 +389,8 @@
empty. Refactoring.
(org-texinfo-src-block): Refactor code. Comply to predicate naming.
- * ox-texinfo.el (org-texinfo--sanitize-node): Handle
- " (not)allowed" case.
+ * ox-texinfo.el (org-texinfo--sanitize-node):
+ Handle " (not)allowed" case.
* ox-texinfo.el (org-texinfo-headline): Remove wrong code
comments.
@@ -414,8 +413,8 @@
* ox-texinfo.el (org-texinfo--sanitize-node): "@", "{" and "}"
characters are allowed in a node name. So are "(" and ")" unless
- "(" starts the name and there is ")" somewhere in the name. Also
- trim and collapse whitespace characters. Renamed from
+ "(" starts the name and there is ")" somewhere in the name.
+ Also trim and collapse whitespace characters. Renamed from
`org-texinfo--sanitize-menu'.
(org-texinfo--get-node): Do not sanitize node names over zealously.
Ensure returned node names are unique.
@@ -427,17 +426,17 @@
* ox-texinfo.el (org-texinfo--normalize-headlines): Make sure a
blank line always follows nodes.
- * ox-texinfo.el (org-texinfo-make-menu): Change signature. Remove
- some intermediate functions. Generate the full master menu when
+ * ox-texinfo.el (org-texinfo-make-menu): Change signature.
+ Remove some intermediate functions. Generate the full master menu when
asked.
(org-texinfo--build-menu): Use a simpler algorithm.
(org-texinfo--format-entries): Fix entries when both node and title
are different.
- (org-texinfo--menu-entries): Renamed from
`org-texinfo--generate-menu-list'.
+ (org-texinfo--menu-entries): Rename from
`org-texinfo--generate-menu-list'.
(org-texinfo-headline): Move menu handling to next function.
(org-texinfo-section): Handle menu for current parent.
- (org-texinfo--menu-headlines, org-texinfo--generate-detailed): Remove
- functions.
+ (org-texinfo--menu-headlines, org-texinfo--generate-detailed):
+ Remove functions.
(org-texinfo--normalize-headlines): New function.
* ox-texinfo.el (org-texinfo-headline): Fix @appendix command.
@@ -517,8 +516,8 @@
* org-element.el (org-element-headline-parser): Add missing
`:post-blank' property in docstring.
- * ox-latex.el (org-latex-table-scientific-notation): Set
- appropriate value.
+ * ox-latex.el (org-latex-table-scientific-notation):
+ Set appropriate value.
(org-latex-listings-options): Fix docstring.
* ox.el (org-export-raw-special-block-p): New function.
@@ -555,8 +554,8 @@
* org.el (org-insert-heading): Fix error when inserting a headline
before first headline, with point not at bol. Remove source block
- check for consistency with behavior after first headline. Tiny
- fix to docstring.
+ check for consistency with behavior after first headline.
+ Tiny fix to docstring.
* org.el (org-scan-tags): Fix typo in docstring.
@@ -589,8 +588,8 @@
empty.
* ox-html.el (org-html-standalone-image-p): Ensure paragraph
- contains at least a link before return a non-nil value. Clarify
- docstring.
+ contains at least a link before return a non-nil value.
+ Clarify docstring.
* ox.el (org-export-data): Always return a string, as specified
by the docstring.
@@ -604,8 +603,8 @@
org-icalendar-blocked-headline-p): Fix docstrings.
(org-icalendar-clear-blank-lines): Fix docstring and regexp.
- * ox-icalendar.el (org-icalendar-entry): Use
- `org-icalendar-with-timestamps'.
+ * ox-icalendar.el (org-icalendar-entry):
+ Use `org-icalendar-with-timestamps'.
2014-10-03 Nicolas Richard <address@hidden>
@@ -621,8 +620,8 @@
2014-10-03 Marco Wahl <address@hidden> (tiny change)
* org-agenda.el (org-agenda-bulk-mark)
- (org-agenda-bulk-mark-regexp, org-agenda-bulk-toggle-all): Fix
- org-agenda-bulk-mark-all when time-grid is shown.
+ (org-agenda-bulk-mark-regexp, org-agenda-bulk-toggle-all):
+ Fix org-agenda-bulk-mark-all when time-grid is shown.
2014-06-23 Stefan Monnier <address@hidden>
@@ -13609,7 +13608,7 @@
* ob.el (org-babel-params-from-properties): Now splits
multiple var arguments behind a single ":var".
- (org-babel-balanced-split): Separated balanced splitting of
+ (org-babel-balanced-split): Separate balanced splitting of
strings out into a new function.
(org-babel-parse-multiple-vars): Splits multiple var arguments
behind a single ":var".
@@ -21400,7 +21399,7 @@
2010-11-11 Eric Schulte <address@hidden>
- * ob-exp.el (org-babel-exp-results): Replaced old function call.
+ * ob-exp.el (org-babel-exp-results): Replace old function call.
2010-11-11 Eric Schulte <address@hidden>
@@ -21593,7 +21592,7 @@
2010-11-11 Noorul Islam <address@hidden>
- * org-latex.el (org-export-latex-links): Replaced hard coded
+ * org-latex.el (org-export-latex-links): Replace hard coded
hyperref format with custom variable
`org-export-latex-hyperref-format'.
=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/lisp/url/ChangeLog 2014-10-21 01:17:06 +0000
@@ -128,19 +128,19 @@
2013-08-12 Lars Magne Ingebrigtsen <address@hidden>
- * url-http.el (url-handle-content-transfer-encoding): Renamed
+ * url-http.el (url-handle-content-transfer-encoding): Rename
`zlib-decompress-gzipped-region' and check whether it's available,
too.
- (url-handle-content-transfer-encoding): Renamed
- `zlib-decompress-region' again.
+ (url-handle-content-transfer-encoding):
+ Rename `zlib-decompress-region' again.
2013-08-11 Lars Magne Ingebrigtsen <address@hidden>
* url-vars.el (url-mime-encoding-string): If we have built-in gzip
support, say that we accept gzipped content.
- * url-http.el (url-handle-content-transfer-encoding): Support
- decompressing gzipped content.
+ * url-http.el (url-handle-content-transfer-encoding):
+ Support decompressing gzipped content.
2013-07-31 Stefan Monnier <address@hidden>
=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/oldXMenu/ChangeLog 2014-10-21 01:17:06 +0000
@@ -98,8 +98,8 @@
(MAX_INACT_PNUM, TILE_BUF_SIZE): Remove; unused.
(x_get_resource_string): Args are readonly.
(XAllocDisplayColor): colorName is readonly.
- (XMenuCreate): def_env is readonly. Remove unused locals. Avoid
- "else;".
+ (XMenuCreate): def_env is readonly. Remove unused locals.
+ Avoid "else;".
* Destroy.c (XMenuDestroy): Return void.
* Error.c (XMenuError): Remove const pointer.
* EvHand.c (XMenuEventHandler): Return void.
@@ -354,7 +354,7 @@
1995-02-07 Richard Stallman <address@hidden>
- * Makefile.in (maintainer-clean): Renamed from realclean.
+ * Makefile.in (maintainer-clean): Rename from realclean.
1994-10-25 Richard Stallman <address@hidden>
@@ -434,8 +434,8 @@
1993-09-27 Brian J. Fox (address@hidden)
- * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS): Allow
- `configure' to supply the values for these variables.
+ * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS):
+ Allow `configure' to supply the values for these variables.
1993-09-26 Brian J. Fox (address@hidden)
@@ -640,7 +640,7 @@
* XDelAssoc.c, XLookAssoc.c, XCrAssoc.c, XDestAssoc.c, XMakeAssoc.c:
Use Xlib.h, not Xlibint.h.
- * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Defined.
+ * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Define.
* XMakeAssoc.c, XCrAssoc.c: Include errno.h. Declare errno.
* XMakeAssoc.c (_XIOErrorFunction): Declared.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/src/ChangeLog 2014-10-21 01:17:06 +0000
@@ -1,3 +1,8 @@
+2014-10-21 Stefan Monnier <address@hidden>
+
+ * xdisp.c (redisplay_window): Re-run pre-redisplay-function after we
+ move point.
+
2014-10-20 Glenn Morris <address@hidden>
* Merge in all changes up to 24.4 release.
@@ -43,11 +48,11 @@
* gtkutil.c (XG_TEXT_CANCEL, XG_TEXT_OPEN, XG_TEXT_OK): New defines
to handle Gtk versions.
(xg_get_file_with_chooser): Use them.
- (xg_have_tear_offs, tearoff_remove, tearoff_activate): Remove
- (create_menus): Remove teroff argument and code.
+ (xg_have_tear_offs, tearoff_remove, tearoff_activate):
+ Remove (create_menus): Remove teroff argument and code.
Remove call to gtk_menu_set_title.
- (xg_update_menubar, xg_update_submenu): Remove tearoff code. Adjust
- args to create_menus.
+ (xg_update_menubar, xg_update_submenu): Remove tearoff code.
+ Adjust args to create_menus.
(xg_tool_bar_menu_proxy, xg_tool_bar_detach_callback)
(xg_tool_bar_attach_callback, TOOLBAR_TOP_WIDGET): Remove.
(xg_pack_tool_bar): Replace TOOLBAR_TOP_WIDGET, remove detach code.
@@ -58,8 +63,8 @@
find_icon_from_name. Let stock be a list of icon names to try.
Only use gtk_image_new_from_stock on Gtk+ < 3.10.
Replace TOOLBAR_TOP_WIDGET.
- (free_frame_tool_bar, xg_change_toolbar_position ): Replace
- TOOLBAR_TOP_WIDGET.
+ (free_frame_tool_bar, xg_change_toolbar_position ):
+ Replace TOOLBAR_TOP_WIDGET.
(xg_initialize): Remove tearoff code.
2014-10-18 Eli Zaretskii <address@hidden>
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2014-10-18 13:09:18 +0000
+++ b/src/xdisp.c 2014-10-21 01:17:06 +0000
@@ -16345,16 +16345,24 @@
set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0);
- /* If we are highlighting the region, then we just changed
- the region, so redisplay to show it. */
- /* FIXME: We need to (re)run pre-redisplay-function! */
- /* if (markpos_of_region () >= 0)
+ /* Re-run pre-redisplay-function so it can update the region
+ according to the new position of point. */
+ /* Other than the cursor, w's redisplay is done so we can set its
+ redisplay to false. Also the buffer's redisplay can be set to
+ false, since propagate_buffer_redisplay should have already
+ propagated its info to `w' anyway. */
+ w->redisplay = false;
+ XBUFFER (w->contents)->text->redisplay = false;
+ safe__call1 (true, Vpre_redisplay_function, Fcons (window, Qnil));
+
+ if (w->redisplay || XBUFFER (w->contents)->text->redisplay)
{
+ /* pre-redisplay-function made changes (e.g. move the region)
+ that require another round of redisplay. */
clear_glyph_matrix (w->desired_matrix);
if (!try_window (window, startp, 0))
goto need_larger_matrices;
}
- */
}
if (w->cursor.vpos < 0 || !cursor_row_fully_visible_p (w, 0, 0))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118169: Merge from emacs-24,
Stefan Monnier <=