From: Chong Yidong Date: Sun, 15 Apr 2012 07:28:01 +0000 (+0800) Subject: Merge from emacs-24 branch X-Git-Tag: emacs-24.2.90~471^2~359^2~4 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6fd457e010c2ec034a331335530d817852cc11c;p=emacs.git Merge from emacs-24 branch --- e6fd457e010c2ec034a331335530d817852cc11c diff --cc doc/emacs/ChangeLog index 156f59471f6,18428c0ba48..63ccb880d40 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,4 -1,38 +1,38 @@@ + 2012-04-15 Chong Yidong + + * misc.texi (emacsclient Options): More clarifications. + -2012-04-14 Glenn Morris ++2012-04-15 Glenn Morris + + * msdog.texi (Windows Printing): It doesn't set printer-name. + + * mule.texi (Language Environments): Move font info to "Fontsets". + (Fontsets): Move intlfonts etc here from "Language Environments". + Copyedits. + (Defining Fontsets, Modifying Fontsets, Undisplayable Characters) + (Unibyte Mode, Charsets, Bidirectional Editing): Copyedits. + -2012-04-14 Chong Yidong ++2012-04-15 Chong Yidong + + * glossary.texi (Glossary): Standardize on "text terminal" + terminology. All callers changed. + + * misc.texi (emacsclient Options): Document "client frame" concept + and its effect on C-x C-c more carefully. + -2012-04-14 Glenn Morris ++2012-04-15 Glenn Morris + + * frames.texi (Scroll Bars): + * glossary.texi (Glossary): Use consistent case for "X Window System". + + * mule.texi (Select Input Method, Coding Systems): + State command names in kbd tables. + (Recognize Coding): Add cross-ref. + (Output Coding): Don't mention message mode in particular. + (Text Coding, Communication Coding, File Name Coding, Terminal Coding): + Copyedits. + -2012-04-13 Glenn Morris +2012-04-14 Glenn Morris * mule.texi (Select Input Method, Coding Systems, Recognize Coding): Copyedits. diff --cc doc/lispref/ChangeLog index 6b3aba6d799,74c32ccb7bb..b5a25cb1c51 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,24 +1,24 @@@ + 2012-04-15 Glenn Morris + + * processes.texi (Processes, Subprocess Creation, Shell Arguments): + (Synchronous Processes, Asynchronous Processes, Deleting Processes): + Copyedits. + (Subprocess Creation): Discourage modifying exec-path directly. + (Synchronous Processes, Asynchronous Processes): + Update some example output. + (Process Information): Fix typo. + (Bindat Spec): Use Texinfo-recommended form of quote+punctuation. + -2012-04-14 Glenn Morris ++2012-04-15 Glenn Morris + + * anti.texi (Antinews): Copyedits. Don't @dfn anything here. + open-network-stream does exist in Emacs 23, but is simpler. + -2012-04-13 Chong Yidong ++2012-04-15 Chong Yidong + + * customize.texi (Custom Themes): Also document load-theme etc. + -2012-04-12 Chong Yidong +2012-04-14 Chong Yidong * customize.texi (Applying Customizations): (Custom Themes): New nodes. diff --cc lisp/ChangeLog index 3d935d5b01f,8c9f5b9f035..b2a3f135109 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,43 -1,17 +1,56 @@@ ++2012-04-15 Stefan Monnier ++ ++ Avoid the use of ((lambda ...) ...) in lexical-binding code. ++ * emacs-lisp/easy-mmode.el (define-minor-mode):Use funcall (bug#11241). ++ + 2012-04-15 Glenn Morris + + * simple.el (process-file-side-effects): Doc fix. + -2012-04-14 Glenn Morris ++2012-04-15 Glenn Morris + + * international/mule-cmds.el (set-language-environment): Doc fix. + +2012-04-14 Juanma Barranquero + + * server.el (server-auth-key, server-generate-key): Doc fixes. + (server-get-auth-key): Doc fix. Use `string-match-p'. + (server-start): Reflow docstring. + +2012-04-14 Lars Ingebrigtsen + + * server.el (server-generate-key): `called-interactively-p' + requires a parameter. + +2012-04-14 Michal Nazarewicz + + * server.el (server-auth-key): New variable. + (server-generate-key, server-get-auth-key): New function. + (server-start): Use the new variable and functions to allow + setting a permanent server key (bug#9423). + +2012-04-14 Leo Liu + + * vc/diff-mode.el (diff-file-prev/next): Fix typo. + +2012-04-14 Paul Eggert + + Spelling fixes. + * hexl.el (hexl-rulerize): Rename from hexl-rulerise, since + Emacs uses American spelling. + +2012-04-14 Juanma Barranquero + + * emacs-lock.el (emacs-lock-locked-buffer-functions): New hook. + (emacs-lock--exit-locked-buffer): Return the locked buffer. Doc fix. + (emacs-lock--kill-emacs-hook, emacs-lock--kill-emacs-query-functions) + (emacs-lock--kill-buffer-query-functions): Run new hook. (Bug#11017) + 2012-04-14 Stefan Monnier - Avoid the use of ((lambda ...) ...) in lexical-binding code. - * emacs-lisp/easy-mmode.el (define-minor-mode):Use funcall (bug#11241). + * progmodes/which-func.el (which-func-modes): Change default. -2012-04-13 Kim F. Storm +2012-04-14 Kim F. Storm * emulation/cua-base.el (cua-exchange-point-and-mark): Just call exchange-point-and-mark if cua-enable-cua-keys is nil (Bug#11191).