Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca
authorGlenn Morris <rgm@gnu.org>
Wed, 5 Sep 2012 07:05:56 +0000 (00:05 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 5 Sep 2012 07:05:56 +0000 (00:05 -0700)
1  2 
lisp/ChangeLog
lisp/calendar/holidays.el
lisp/emulation/cua-rect.el
lisp/play/blackbox.el
lisp/progmodes/flymake.el
lisp/progmodes/sh-script.el
lisp/textmodes/picture.el

diff --cc lisp/ChangeLog
 -2012-08-31  Glenn Morris  <rgm@gnu.org>
++2012-09-05  Glenn Morris  <rgm@gnu.org>
+       * emulation/cua-rect.el (cua--init-rectangles):
+       * textmodes/picture.el (picture-mode-map):
+       * play/blackbox.el (blackbox-mode-map): Remap right-char and left-char
+       like forward-char and backward-char.  (Bug#12317)
 -2012-08-30  Leo Liu  <sdl.web@gmail.com>
++2012-09-05  Leo Liu  <sdl.web@gmail.com>
+       * progmodes/flymake.el (flymake-warning-re): New variable.
+       (flymake-parse-line): Use it.
 -2012-08-30  Glenn Morris  <rgm@gnu.org>
++2012-09-05  Glenn Morris  <rgm@gnu.org>
+       * calendar/holidays.el (holiday-christian-holidays):
+       Rename an entry.  (Bug#12289)
 -2012-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
++2012-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/sh-script.el (sh-font-lock-paren): Don't burp at BOB
+       (bug#12222).
 -2012-08-27  Leo Liu  <sdl.web@gmail.com>
 +2012-09-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * loadup.el: Load macroexp.  Remove hack.
 +      * emacs-lisp/macroexp.el (macroexp--eval-if-compile): New function.
 +      (macroexp--expand-all): Use it to get better warnings.
 +      (macroexp--backtrace, macroexp--trim-backtrace-frame)
 +      (internal-macroexpand-for-load): New functions.
 +      (macroexp--pending-eager-loads): New var.
 +      (emacs-startup-hook): New hack to replace one in loadup.el.
 +      * emacs-lisp/cl-macs.el (cl--compiler-macro-list*)
 +      (cl--compiler-macro-cXXr): Move to top, before they can be used.
 +      (cl-psetf): Simplify.
 +      (cl-defstruct): Add indent rule.
 +
 +2012-09-04  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * mail/smtpmail.el (smtpmail-send-it): Prefer the From: header
 +      over `user-mail-address' for the SMTP MAIL FROM envelope.
 +      (smtpmail-via-smtp): Ditto.
 +
 +2012-09-04  Dmitry Gutov  <dgutov@yandex.ru>
 +
 +      * progmodes/ruby-mode.el: Clean up keybindings.
 +      (ruby-mode-map): Don't bind ruby-electric-brace,
 +      ruby-beginning-of-defun, ruby-end-of-defun, ruby-mark-defun,
 +      backward-kill-word, reindent-then-newline-and-indent.
 +      (ruby-mark-defun): Remove.
 +      (ruby-electric-brace): Remove.  Obsoleted by electric-indent-chars.
 +      (ruby-mode): Set local beginning-of-defun-function and
 +      end-of-defun-function values.
 +
 +2012-09-03  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (temp-buffer-window-setup-hook)
 +      (temp-buffer-window-show-hook): New hooks.
 +      (temp-buffer-window-setup, temp-buffer-window-show)
 +      (with-temp-buffer-window): New functions.
 +      (fit-window-to-buffer): Remove unused optional argument OVERRIDE.
 +      (special-display-popup-frame): Make sure the window used shows BUFFER.
 +
 +      * help.el (temp-buffer-resize-mode): Fix doc-string.
 +      (resize-temp-buffer-window): New optional argument WINDOW.
 +
 +      * files.el (recover-file, save-buffers-kill-emacs):
 +      * dired.el (dired-mark-pop-up): Use with-temp-buffer-window.
 +
 +2012-09-02  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * eshell/em-unix.el (eshell/sudo): When we have an ad-hoc
 +      remote definition of `default-directory', ensure we can connect.
 +
 +2012-09-02  Juri Linkov  <juri@jurta.org>
 +
 +      Toggle whitespace matching mode with M-s SPC.
 +      http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00008.html
 +
 +      * isearch.el (search-whitespace-regexp): Doc fix.
 +      Remove cons cell customization.
 +      (isearch-mode-map): Bind "\M-s " to isearch-toggle-lax-whitespace.
 +      (isearch-lax-whitespace, isearch-regexp-lax-whitespace):
 +      New variables.
 +      (isearch-forward, isearch-forward-regexp): Doc fix.
 +      (isearch-toggle-lax-whitespace): New command.
 +      (search-forward-lax-whitespace, search-backward-lax-whitespace)
 +      (re-search-forward-lax-whitespace)
 +      (re-search-backward-lax-whitespace): New functions.
 +      (isearch-whitespace-regexp): Remove function.
 +      (isearch-query-replace): Let-bind replace-search-function and
 +      replace-re-search-function.
 +      (isearch-occur): Let-bind search-spaces-regexp according to the
 +      value of isearch-lax-whitespace and isearch-regexp-lax-whitespace.
 +      (isearch-quote-char): Check isearch-regexp-lax-whitespace in the
 +      condition for C-q SPC.
 +      (isearch-search-fun-default): Use new functions mentioned above.
 +      (isearch-search-forward, isearch-search-backward): Remove functions.
 +      (isearch-search): Don't let-bind search-spaces-regexp.
 +      (isearch-lazy-highlight-space-regexp): Remove variable.
 +      (isearch-lazy-highlight-lax-whitespace)
 +      (isearch-lazy-highlight-regexp-lax-whitespace): New variables.
 +      (isearch-lazy-highlight-new-loop): Use them.
 +      (isearch-lazy-highlight-search): Don't let-bind search-spaces-regexp.
 +
 +2012-09-02  Chong Yidong  <cyd@gnu.org>
 +
 +      * dired.el (dired-mode-map): Menu string fixes (Bug#11616).
 +
 +2012-09-02  Glenn Morris  <rgm@gnu.org>
 +
 +      * simple.el (undo): Tweak message in undo-only case.  (Bug#12283)
 +
 +2012-09-01  Glenn Morris  <rgm@gnu.org>
 +
 +      * term.el: Tidy up menu definitions.
 +      (term-mode-map): Use easymenu for In/Out, Complete menus.
 +      (term-pager-break-map): Initialize in the defvar.
 +      (term-terminal-menu, term-signals-menu): Define with easymenu.
 +      (term-terminal-menu): Also show it in line-mode.  (Bug#11957)
 +      (term-pager-menu): New, extracted from term-process-pager.
 +      (term-mode, term-char-mode, term-process-pager): Use easymenu-add.
 +      (term-update-mode-line): Propertize line/char and page items.
 +      (term-process-pager): Move keymap initialization elsewhere.
 +
 +2012-09-01  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (switch-to-prev-buffer): Handle additional values of
 +      BURY-OR-KILL argument.  Don't switch in minibuffer window.
 +      (switch-to-next-buffer): Don't switch in minibuffer window.
 +      (quit-restore-window): New function based on quit-window.
 +      Handle additional values of former KILL argument.
 +      (quit-window): Call quit-restore-window with appropriate
 +      interpretation of KILL argument.
 +      (display-buffer-below-selected): New buffer display action
 +      function.
 +
 +2012-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * minibuffer.el (completion-at-point-functions): Complete docstring
 +      (bug#12254).
 +
 +2012-09-01  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Better seed support for (random).
 +      * play/5x5.el, play/animate.el, play/cookie1.el, play/dissociate.el:
 +      * play/doctor.el, play/dunnet.el, play/gomoku.el, play/landmark.el:
 +      * play/mpuz.el, play/tetris.el, play/zone.el:
 +      * calc/calc-comb.el (math-init-random-base):
 +      * play/blackbox.el (bb-init-board):
 +      * play/life.el (life):
 +      * server.el (server-use-tcp):
 +      * type-break.el (type-break):
 +      Remove unnecessary call to (random t).
 +      * net/sasl.el (sasl-unique-id-function):
 +      Change (random t) to (random), now that the latter is more random.
 +      * play/life.el (life-initialized): Remove no-longer-needed var.
 +
 +2012-08-31  Alp Aker  <alp.tekin.aker@gmail.com>
 +
 +      * window.el (switch-to-prev-buffer, switch-to-next-buffer):
 +      Consider frame's buffer predicate when choosing the buffer.
 +      (Bug#12081)
 +
 +2012-08-30  Richard Stallman  <rms@gnu.org>
 +
 +      * simple.el (special-mode-map): Delete binding for `z'.
 +
 +2012-08-30  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * progmodes/compile.el (compilation-always-kill): Doc fix.
 +
 +2012-08-30  Chong Yidong  <cyd@gnu.org>
 +
 +      * window.el (display-buffer-reuse-frames): Make the obsolescence
 +      message more informative.
 +
 +2012-08-30  Glenn Morris  <rgm@gnu.org>
 +
 +      * paren.el (show-paren-delay):
 +      Add a :set function.  Doc fix.  (Bug#12297)
 +
 +2012-08-29  Martin Blais  <blais@furius.ca>  (tiny change)
 +
 +      * progmodes/compile.el (compilation-always-kill): New var.
 +      (compilation-start): Use it.
 +
 +2012-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * simple.el (read-only-mode): Move from files.el for bootstrapping.
 +      * files.el (read-only-mode): Move to simple.el.
 +
 +      * files.el (read-only-mode): New minor mode.
 +      (toggle-read-only): Use it and mark obsolete.
 +      (find-file--read-only):
 +      * vc/vc.el (vc-next-action, vc-checkout):
 +      * vc/vc-cvs.el (vc-cvs-checkout):
 +      * obsolete/vc-mcvs.el (vc-mcvs-update):
 +      * ffap.el (ffap--toggle-read-only): Update callers.
 +
 +2012-08-29  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * eshell/esh-ext.el (eshell-external-command): Do not examine
 +      remote shell scripts.
 +      See <https://bugs.launchpad.net/ubuntu/+source/emacs23/+bug/1035790>.
 +
 +      * net/tramp-sh.el (tramp-remote-path): Add "/sbin" and
 +      "/usr/local/sbin".
 +
 +2012-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-lib.el (buffer-string): Fix setter macro (bug#12293).
 +
 +2012-08-28  Leo Liu  <sdl.web@gmail.com>
  
        * progmodes/sh-script.el (sh-dynamic-complete-functions): Adapt to
        completion-at-point.  (Bug#12220)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -607,61 -606,66 +607,63 @@@ Leaves the region surrounding the recta
  
  (defalias 'picture-delete-char 'delete-char)
  
 -(defvar picture-mode-map nil)
 -
 -(defun picture-substitute (oldfun newfun)
 -  (define-key picture-mode-map (vector 'remap oldfun) newfun))
 -
 -(if (not picture-mode-map)
 -    (progn
 -      (setq picture-mode-map (make-keymap))
 -      (picture-substitute 'self-insert-command 'picture-self-insert)
 -      (picture-substitute 'completion-separator-self-insert-command
 +(defvar picture-mode-map
 +  (let ((map (make-keymap)))
 +    (define-key map [remap self-insert-command] 'picture-self-insert)
 +    (define-key map [remap self-insert-command] 'picture-self-insert)
 +    (define-key map [remap completion-separator-self-insert-command]
-       'picture-self-insert)
+                         'picture-self-insert)
 -      (picture-substitute 'completion-separator-self-insert-autofilling
 +    (define-key map [remap completion-separator-self-insert-autofilling]
-       'picture-self-insert)
+                         'picture-self-insert)
 -      (picture-substitute 'forward-char 'picture-forward-column)
 -      (picture-substitute 'right-char 'picture-forward-column)
 -      (picture-substitute 'backward-char 'picture-backward-column)
 -      (picture-substitute 'left-char 'picture-backward-column)
 -      (picture-substitute 'delete-char 'picture-clear-column)
 +    (define-key map [remap forward-char] 'picture-forward-column)
++    (define-key map [remap right-char] 'picture-forward-column)
 +    (define-key map [remap backward-char] 'picture-backward-column)
++    (define-key map [remap left-char] 'picture-backward-column)
 +    (define-key map [remap delete-char] 'picture-clear-column)
-     ;; There are two possibilities for what is normally on DEL.
+       ;; There are two possibilities for what is normally on DEL.
 -      (picture-substitute 'backward-delete-char-untabify 'picture-backward-clear-column)
 -      (picture-substitute 'delete-backward-char 'picture-backward-clear-column)
 -      (picture-substitute 'kill-line 'picture-clear-line)
 -      (picture-substitute 'open-line 'picture-open-line)
 -      (picture-substitute 'newline 'picture-newline)
 -      (picture-substitute 'newline-and-indent 'picture-duplicate-line)
 -      (picture-substitute 'next-line 'picture-move-down)
 -      (picture-substitute 'previous-line 'picture-move-up)
 -      (picture-substitute 'move-beginning-of-line 'picture-beginning-of-line)
 -      (picture-substitute 'move-end-of-line 'picture-end-of-line)
 -      (picture-substitute 'mouse-set-point 'picture-mouse-set-point)
 -
 -      (define-key picture-mode-map "\C-c\C-d" 'picture-delete-char)
 -      (define-key picture-mode-map "\e\t" 'picture-toggle-tab-state)
 -      (define-key picture-mode-map "\t" 'picture-tab)
 -      (define-key picture-mode-map "\e\t" 'picture-tab-search)
 -      (define-key picture-mode-map "\C-c\t" 'picture-set-tab-stops)
 -      (define-key picture-mode-map "\C-c\C-k" 'picture-clear-rectangle)
 -      (define-key picture-mode-map "\C-c\C-w" 'picture-clear-rectangle-to-register)
 -      (define-key picture-mode-map "\C-c\C-y" 'picture-yank-rectangle)
 -      (define-key picture-mode-map "\C-c\C-x" 'picture-yank-rectangle-from-register)
 -      (define-key picture-mode-map "\C-c\C-r" 'picture-draw-rectangle)
 -      (define-key picture-mode-map "\C-c\C-c" 'picture-mode-exit)
 -      (define-key picture-mode-map "\C-c\C-f" 'picture-motion)
 -      (define-key picture-mode-map "\C-c\C-b" 'picture-motion-reverse)
 -      (define-key picture-mode-map "\C-c<" 'picture-movement-left)
 -      (define-key picture-mode-map "\C-c>" 'picture-movement-right)
 -      (define-key picture-mode-map "\C-c^" 'picture-movement-up)
 -      (define-key picture-mode-map "\C-c." 'picture-movement-down)
 -      (define-key picture-mode-map "\C-c`" 'picture-movement-nw)
 -      (define-key picture-mode-map "\C-c'" 'picture-movement-ne)
 -      (define-key picture-mode-map "\C-c/" 'picture-movement-sw)
 -      (define-key picture-mode-map "\C-c\\" 'picture-movement-se)
 -      (define-key picture-mode-map [(control ?c) left]  'picture-movement-left)
 -      (define-key picture-mode-map [(control ?c) right] 'picture-movement-right)
 -      (define-key picture-mode-map [(control ?c) up]    'picture-movement-up)
 -      (define-key picture-mode-map [(control ?c) down]  'picture-movement-down)
 -      (define-key picture-mode-map [(control ?c) home]  'picture-movement-nw)
 -      (define-key picture-mode-map [(control ?c) prior] 'picture-movement-ne)
 -      (define-key picture-mode-map [(control ?c) end]   'picture-movement-sw)
 -      (define-key picture-mode-map [(control ?c) next]  'picture-movement-se)))
 +    (define-key map [remap backward-delete-char-untabify]
 +      'picture-backward-clear-column)
 +    (define-key map [remap delete-backward-char] 'picture-backward-clear-column)
 +    (define-key map [remap kill-line] 'picture-clear-line)
 +    (define-key map [remap open-line] 'picture-open-line)
 +    (define-key map [remap newline] 'picture-newline)
 +    (define-key map [remap newline-and-indent] 'picture-duplicate-line)
 +    (define-key map [remap next-line] 'picture-move-down)
 +    (define-key map [remap previous-line] 'picture-move-up)
 +    (define-key map [remap move-beginning-of-line] 'picture-beginning-of-line)
 +    (define-key map [remap move-end-of-line] 'picture-end-of-line)
 +    (define-key map [remap mouse-set-point] 'picture-mouse-set-point)
 +    (define-key map "\C-c\C-d" 'picture-delete-char)
 +    (define-key map "\e\t" 'picture-toggle-tab-state)
 +    (define-key map "\t" 'picture-tab)
 +    (define-key map "\e\t" 'picture-tab-search)
 +    (define-key map "\C-c\t" 'picture-set-tab-stops)
 +    (define-key map "\C-c\C-k" 'picture-clear-rectangle)
 +    (define-key map "\C-c\C-w" 'picture-clear-rectangle-to-register)
 +    (define-key map "\C-c\C-y" 'picture-yank-rectangle)
 +    (define-key map "\C-c\C-x" 'picture-yank-rectangle-from-register)
 +    (define-key map "\C-c\C-r" 'picture-draw-rectangle)
 +    (define-key map "\C-c\C-c" 'picture-mode-exit)
 +    (define-key map "\C-c\C-f" 'picture-motion)
 +    (define-key map "\C-c\C-b" 'picture-motion-reverse)
 +    (define-key map "\C-c<" 'picture-movement-left)
 +    (define-key map "\C-c>" 'picture-movement-right)
 +    (define-key map "\C-c^" 'picture-movement-up)
 +    (define-key map "\C-c." 'picture-movement-down)
 +    (define-key map "\C-c`" 'picture-movement-nw)
 +    (define-key map "\C-c'" 'picture-movement-ne)
 +    (define-key map "\C-c/" 'picture-movement-sw)
 +    (define-key map "\C-c\\" 'picture-movement-se)
 +    (define-key map [(control ?c) left]  'picture-movement-left)
 +    (define-key map [(control ?c) right] 'picture-movement-right)
 +    (define-key map [(control ?c) up]    'picture-movement-up)
 +    (define-key map [(control ?c) down]  'picture-movement-down)
 +    (define-key map [(control ?c) home]  'picture-movement-nw)
 +    (define-key map [(control ?c) prior] 'picture-movement-ne)
 +    (define-key map [(control ?c) end]   'picture-movement-sw)
 +    (define-key map [(control ?c) next]  'picture-movement-se)
 +    map)
 +  "Keymap used in `picture-mode'.")
  
  (defcustom picture-mode-hook nil
    "If non-nil, its value is called on entry to Picture mode.