From: Xue Fuqiao Date: Wed, 12 Jun 2013 12:12:47 +0000 (+0800) Subject: Merge from mainline. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2016^2~145 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6186a2767fcae48a43675dabc457ed2b2177b884;p=emacs.git Merge from mainline. --- 6186a2767fcae48a43675dabc457ed2b2177b884 diff --cc doc/emacs/ChangeLog index 9f9f7da7d82,6f2d9517df7..f56f2f51e07 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,12 -1,11 +1,16 @@@ + 2013-06-11 Glenn Morris + + * maintaining.texi (VC Directory Commands): Copyedit. + (Branches): Put back milder version of pre 2013-06-07 text. + +2013-06-09 Xue Fuqiao + + * vc1-xtra.texi (Revision Tags): Add a cross reference. + (CVS Options): Fix the default value of `vc-cvs-stay-local'. + 2013-06-07 Xue Fuqiao - * maintaining.texi (Branches): Remove text copied from other - sources. + * maintaining.texi (Branches): Remove text copied from other sources. 2013-06-05 Alan Mackenzie diff --cc lisp/ChangeLog index a6f45a1d727,4d08b2ee1ab..5abb3b1b1bc --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,9 -1,144 +1,149 @@@ + 2013-06-12 Xue Fuqiao + + * ibuf-ext.el (ibuffer-mark-help-buffers): Doc fix. + + 2013-06-12 Andreas Schwab + + * international/mule.el (auto-coding-alist): Use utf-8-emacs-unix + for auto-save files. + + 2013-06-12 Glenn Morris + + * ido.el (ido-delete-ignored-files): Remove. + (ido-wide-find-dirs-or-files, ido-make-file-list-1): + Go back to calling ido-ignore-item-p directly. + + 2013-06-12 Eyal Lotem (tiny change) + + * ido.el (ido-wide-find-dirs-or-files): Respect ido-case-fold. + + * ido.el (ido-delete-ignored-files): New function, + split from ido-make-file-list-1. + (ido-wide-find-dirs-or-files): Maybe ignore files. (Bug#13003) + (ido-make-file-list-1): Use ido-delete-ignored-files. + + 2013-06-12 Leo Liu + + * progmodes/octave.el (inferior-octave-startup) + (inferior-octave-completion-table) + (inferior-octave-track-window-width-change) + (octave-eldoc-function-signatures, octave-help) + (octave-find-definition): Use single quoted strings. + (inferior-octave-startup-args): Change default value. + (inferior-octave-startup): Do not hard code "-i" and + "--no-line-editing". + (inferior-octave-resync-dirs): Add optional arg NOERROR. + (inferior-octave-directory-tracker): Use it. + (octave-goto-function-definition): Robustify. + (octave-help): Support highlighting operators in 'See also'. + (octave-find-definition): Find subfunctions only in Octave mode. + + 2013-06-12 Stefan Monnier + + * help-fns.el (help-fns--compiler-macro): If the handler function is + named, then put a link to it. + * help-mode.el (help-function-cmacro): Adjust regexp for cl-lib names. + * emacs-lisp/cl-macs.el (cl--compiler-macro-typep): New function. + (cl-typep): Use it. + (cl-eval-when): Simplify debug spec. + (cl-define-compiler-macro): Use eval-and-compile. Give a name to the + compiler-macro function instead of setting `compiler-macro-file'. + + 2013-06-12 Stefan Monnier + Daniel Hackney + + First part of Daniel Hackney's patch to package.el. + * emacs-lisp/package.el: Use defstruct. + (package-desc): New, main struct. + (package--bi-desc, package--ac-desc): New structs, used to describe the + format in external files. + (package-desc-vers): Replace with package-desc-version accessor. + (package-desc-doc): Replace with package-desc-summary accessor. + (package-activate-1): Remove `package' arg since the pkg-vec now + includes the name. + (define-package): Use package-desc-from-define. + (package-unpack-single): Change file-name arg to be a symbol. + (package--add-to-archive-contents): Use package-desc-create and new + accessor functions to package--ac-desc. + (package-buffer-info, package-tar-file-info): Return a package-desc. + (package-install-from-buffer): Remove `type' argument. Change pkg-info + arg to be a package-desc. + (package-install-file): Adjust accordingly. Use \' to match EOS. + (package--from-builtin): New function. + (describe-package-1, package-menu--generate): Use it. + (package--make-autoloads-and-compile): Change name arg to be a symbol. + (package-generate-autoloads): Idem and return the name of the file. + * emacs-lisp/package-x.el (package-upload-buffer-internal): + Change pkg-info arg to be a package-desc. + Use package-make-ac-desc. + (package-upload-file): Use \' to match EOS. + * finder.el (finder-compile-keywords): Use package-make-builtin. + + 2013-06-11 Stefan Monnier + + * vc/vc.el (vc-deduce-fileset): Change error message. + (vc-read-backend): New function. + (vc-next-action): Use it. + + * subr.el (function-arity): Remove (mistakenly added) (bug#14590). + + * progmodes/prolog.el (prolog-make-keywords-regexp): Remove. + (prolog-font-lock-keywords): Use regexp-opt instead. + Don't manually highlight strings. + (prolog-mode-variables): Simplify comment-start-skip. + (prolog-consult-compile): Use display-buffer. Remove unused old-filter. + + * emacs-lisp/generic.el (generic--normalise-comments) + (generic-set-comment-syntax, generic-set-comment-vars): New functions. + (generic-mode-set-comments): Use them. + (generic-bracket-support): Use setq-local. + (generic-make-keywords-list): Declare obsolete. + + 2013-06-11 Glenn Morris + + * emacs-lisp/lisp-mode.el (lisp-mode-variables): + Prettify after setting font-lock-defaults. (Bug#14574) + + 2013-06-11 Juanma Barranquero + + * replace.el (query-replace, occur-read-regexp-defaults-function) + (replace-search): + * subr.el (declare-function, number-sequence, local-set-key) + (substitute-key-definition, locate-user-emacs-file) + (with-silent-modifications, split-string, eval-after-load): + Fix typos, remove unneeded backslashes and reflow some docstrings. + + 2013-06-11 Stefan Monnier + + * international/mule-conf.el (file-coding-system-alist): Use utf-8 as + default for Elisp files. + + 2013-06-11 Glenn Morris + + * vc/log-view.el (log-view-mode-map): Inherit from special-mode-map, + although define-derived-mode was doing this anyway. (Bug#14583) + + 2013-06-10 Juanma Barranquero + + * allout.el (allout-encryption-plaintext-sanitization-regexps): + Fix make-variable-buffer-local call to refer to the correct variable. + + 2013-06-10 Aidan Gauland + + * eshell/em-term.el (eshell-visual-commands) + (eshell-visual-subcommands, eshell-visual-options): + Add summary line to docstrings. Add cross-references. + + 2013-06-10 Glenn Morris + + * epa.el (epa-read-file-name): New function. (Bug#14510) + (epa-decrypt-file): Make plain-file optional. Use epa-read-file-name. + +2013-06-09 Xue Fuqiao + + * vc/vc-cvs.el (vc-cvs-stay-local): Doc fix. - + * vc/vc-hooks.el (vc-stay-local): Doc fix. + 2013-06-09 Aidan Gauland * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused