From: Chong Yidong Date: Fri, 6 Jul 2012 04:31:46 +0000 (+0800) Subject: Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org X-Git-Tag: emacs-24.2.90~1199^2~194 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=226c3633fdc0a259aa73aa9e6555cd42dd9f168c;p=emacs.git Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org --- 226c3633fdc0a259aa73aa9e6555cd42dd9f168c diff --cc doc/emacs/ChangeLog index 117bbfc21c8,0d31e64b307..5cd49a9d692 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,4 -1,9 +1,9 @@@ + 2012-06-29 Chong Yidong + + * maintaining.texi (Basic VC Editing, VC Pull, Merging): + * basic.texi (Erasing, Basic Undo): Fix markup. + -2012-06-26 Glenn Morris +2012-06-29 Glenn Morris * fixit.texi (Undo): Grammar fixes. (Bug#11779) diff --cc lisp/ChangeLog index f3aa2953328,e5f4bb8f770..a745669d754 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,206 -1,20 +1,222 @@@ -2012-07-02 Glenn Morris ++2012-07-06 Glenn Morris + + * simple.el (kill-whole-line): Doc tweak. + -2012-07-01 Eli Zaretskii ++2012-07-06 Eli Zaretskii + + * files.el (file-relative-name): Compare file names + case-insensitively if on MS-Windows or MS-DOS, or if + read-file-name-completion-ignore-case is non-nil. Don't use + case-fold-search for this purpose. (Bug#11827) + -2012-06-28 Andreas Schwab ++2012-07-06 Andreas Schwab + + * calendar/cal-dst.el (calendar-current-time-zone): Return + calendar-current-time-zone-cache if non-nil. + -2012-06-25 Masatake YAMATO +2012-07-06 Glenn Morris + + * Makefile.in (cvs-update): Remove old alias. + +2012-07-05 Michael Albinus + + Sync with Tramp 2.2.6-pre. + + * net/tramp.el (tramp-drop-volume-letter): Provide an XEmacs + compatible declaration. + + * net/tramp-cmds.el (tramp-append-tramp-buffers): Protect + `list-load-path-shadows' call. + + * net/tramp-compat.el (top): Require packages, which aren't + autoloaded anymore for XEmacs. Protect call of + `tramp-file-name-handler' by `tramp-compat-funcall', pacifying the + compiler. Do not require tramp-util.el and tramp-vc.el anymore, + it hurts at least for SXEmacs. + (tramp-compat-temporary-file-directory): In XEmacs, there is no + standard-value for `temporary-file-directory'. + + * net/tramp-sh.el (tramp-do-directory-files-and-attributes-with-stat): + Redirect stderr to /dev/null. + (tramp-sh-handle-write-region): uid and gid can be floats. + Reported by Russell Sim . + (tramp-sh-handle-vc-registered): Hide errors. + (tramp-vc-file-name-handler): Use dummy results for `process-file' + and `start-file-process'. + (tramp-maybe-open-connection): Check also whether `non-essential' + is bound. + +2012-07-04 Chong Yidong + + * xml.el (xml--parse-buffer): Use xml-syntax-table. + (xml-parse-tag): Likewise, and avoid changing entity tables. + (xml-syntax-table): Define from scratch, making sure not to give + x2000 and other Unicode spaces whitespace syntax, since those are + not spaces in XML. + (xml-parse-fragment): Delete unused function. + (xml-name-start-char-re, xml-name-char-re, xml-name-re) + (xml-names-re, xml-nmtoken-re, xml-nmtokens-re, xml-char-ref-re) + (xml-entity-ref, xml-pe-reference-re) + (xml-reference-re,xml-att-value-re, xml-tokenized-type-re) + (xml-notation-type-re, xml-enumeration-re, xml-enumerated-type-re) + (xml-att-type-re, xml-default-decl-re, xml-att-def-re) + (xml-entity-value-re): Use syntax references in regexps where + possible; no need to define inside a let-binding. + (xml-parse-dtd): Use xml-pe-reference-re. + (xml-entity-or-char-ref-re): New defconst. + (xml-parse-string, xml-substitute-special): Use it. + +2012-07-04 Stefan Monnier + + * files.el (locate-dominating-file): Allow `name' to be a predicate. + (find-file--read-only): New function. + (find-file-read-only, find-file-read-only-other-window) + (find-file-read-only-other-frame): Use it. + (insert-file-contents-literally): Don't `fset'. + (get-free-disk-space): Use locate-dominating-file. + + * emacs-lisp/bytecomp.el (byte-compile): Don't signal an error if the + function is already compiled. + + * xml.el (xml-name-regexp): Remove, redundant. Use xml-name-re. + +2012-07-03 Michael Albinus + + * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote + files on the same host. + +2012-07-03 Andreas Schwab + + * help-fns.el (describe-function-1): Only call + help-fns--autoloaded-p when we have a file name. (Bug#11848) + +2012-07-03 Chong Yidong + + * xml.el: Protect parser against XML bombs. + (xml-entity-expansion-limit): New variable. + (xml-parse-string, xml-substitute-special): Use it. + (xml-parse-dtd): Avoid infloop if the DTD is not terminated. + +2012-07-03 Glenn Morris + + * progmodes/bug-reference.el (bug-reference-bug-regexp): + Allow linking to specific messages in debbugs reports (eg 123#5). + +2012-07-02 Chong Yidong + + * xml.el: Fix entity and character reference expansion, allowing + them to expand into markup as per XML spec. + (xml-default-ns): New variable. + (xml-entity-alist): Use XML spec definitions for lt and amp. + (xml-parse-region): Make first two arguments optional. + Discard text properties. + (xml-parse-tag-1): New function, spun off from xml-parse-tag. + All callers changed. + (xml-parse-tag): Call xml-parse-tag-1. For backward + compatibility, this function should not modify buffer contents. + (xml-parse-tag-1): Fix opening-tag regexp. + (xml-parse-string): Rewrite, handling entity and character + references properly. + (xml--entity-replacement-text): Signal an error if a parameter + entity is undefined. + +2012-07-02 Stefan Monnier + + * comint.el (comint-output-filter): Filter out repeated prompts. + + * net/ange-ftp.el (ange-ftp-expand-file-name): Use ange-ftp-ftp-name + and file-name-absolute-p. + (ange-ftp-file-exists-p): Use ange-ftp-file-exists-p for + internal calls. + +2012-07-02 Paul Eggert + + Spelling fixes. + * emacs-lisp/bytecomp.el (byte-compile--reify-function): + Rename from byte-compile--refiy-function. All uses changed. + +2012-07-01 Chong Yidong + + * xml.el (xml--parse-buffer): New function. Move most of + xml-parse-region here. + (xml-parse-region): Copy region into a temporary buffer, since + parameter entity substitution requires changing buffer contents. + Use xml--parse-buffer. + (xml-parse-file): Use xml--parse-buffer. + (xml-parse-dtd): Make parameter entity substitution work right. + Use proper regexps for ELEMENT declarations (Bug#7172). + +2012-06-30 Glenn Morris + + * comint.el (follow-comint-scroll-to-bottom): Fix declaration. + + * net/secrets.el, net/tramp-gvfs.el, net/xesam.el, net/zeroconf.el: + Remove outdated and unnecessary dbus declarations. + +2012-06-30 Eli Zaretskii + + * emacs-lisp/timer.el (timer-until): Subtract results of + float-time, instead of taking float-time of the result of + time-subtract, since float-time signals an error for negative time + arguments. + +2012-06-30 Chong Yidong + + * xml.el (xml-*-re): Convert defvars into defconsts, and + eval-and-compile them so eval-and-compile works on derivatives. + (xml--entity-replacement-text): Use eval-and-comple. + +2012-06-30 Michael Albinus + + * vc/vc-git.el (vc-git-registered): Use cache property + `git-registered'. + (vc-git-mode-line-string): Call `vc-working-revision' instead of + `vc-git-working-revision' in order to benefit from the cache. + (vc-git-root): Use cache property `git-root'. + +2012-06-30 Dmitry Gutov + + * vc/vc-hooks.el (vc-before-save): Clear cache if file has been + removed (likely outside Emacs). + +2012-06-30 Stefan Monnier + + * emacs-lisp/cl-lib.el: Require macroexp. + +2012-06-30 Chong Yidong + + * xml.el: Implement XML parameter entities. + (xml-parameter-entity-alist): New variable. + (xml-parse-region, xml-parse-fragment): Preserve previous values + of xml-entity-alist and xml-parameter-entity-alist, so that + repeated calls on different documents do not change them. + (xml-parse-tag): Fix doctype regexp. + (xml--entity-replacement-text): New function. + (xml-parse-dtd): Use it. Don't handle system entities; doing that + properly requires url retrieval which is unimplemented. + (xml-escape-string): Doc fix. + +2012-06-30 Stefan Monnier + + * emacs-lisp/cl-lib.el (cl-pushnew): Use macroexp-let2. + +2012-06-29 Dmitry Antipov + + * fringe.el (fringe-mode): Doc fix. + +2012-06-29 Michael Albinus + + * net/ange-ftp.el (ange-ftp-get-passwd): Throw if `non-essential' + is non-nil. + (ange-ftp-ignore-errors-if-non-essential): New defmacro. + (ange-ftp-file-name-all-completions): Use it. (Bug#11808) + +2012-06-29 Andreas Schwab + + * calendar/cal-dst.el (calendar-current-time-zone): + Return calendar-current-time-zone-cache if non-nil. + +2012-06-29 Masatake YAMATO * progmodes/which-func.el (which-func-format): Add mouse-face. (Bug#11698)