[Emacs-diffs] /srv/bzr/emacs/trunk r109885: Merge from emacs-24; up to r108129

[Glenn Morris]

------------------------------------------------------------
revno: 109885 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-09-05 00:05:56 -0700
message:
  Merge from emacs-24; up to r108129
modified:
  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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-04 17:40:25 +0000
+++ b/lisp/ChangeLog    2012-09-05 07:05:56 +0000
@@ -1,3 +1,25 @@
+2012-09-05  Glenn Morris  <address@hidden>
+
+       * 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-09-05  Leo Liu  <address@hidden>
+
+       * progmodes/flymake.el (flymake-warning-re): New variable.
+       (flymake-parse-line): Use it.
+
+2012-09-05  Glenn Morris  <address@hidden>
+
+       * calendar/holidays.el (holiday-christian-holidays):
+       Rename an entry.  (Bug#12289)
+
+2012-09-05  Stefan Monnier  <address@hidden>
+
+       * progmodes/sh-script.el (sh-font-lock-paren): Don't burp at BOB
+       (bug#12222).
+
 2012-09-04  Stefan Monnier  <address@hidden>
 
        * loadup.el: Load macroexp.  Remove hack.

=== modified file 'lisp/calendar/holidays.el'
--- a/lisp/calendar/holidays.el 2012-08-20 18:13:03 +0000
+++ b/lisp/calendar/holidays.el 2012-09-05 07:05:56 +0000
@@ -250,7 +250,7 @@
     (if calendar-christian-all-holidays-flag
         (append
          (holiday-fixed 1 6 "Epiphany")
-         (holiday-julian 12 25 "Eastern Orthodox Christmas")
+         (holiday-julian 12 25 "Christmas (Julian calendar)")
          (holiday-greek-orthodox-easter)
          (holiday-fixed 8 15 "Assumption")
          (holiday-advent 0 "Advent")))))

=== modified file 'lisp/emulation/cua-rect.el'
--- a/lisp/emulation/cua-rect.el        2012-07-25 05:48:19 +0000
+++ b/lisp/emulation/cua-rect.el        2012-09-05 07:05:56 +0000
@@ -1423,7 +1423,9 @@
   (define-key cua--rectangle-keymap [remap set-mark-command]    
'cua-toggle-rectangle-mark)
 
   (define-key cua--rectangle-keymap [remap forward-char]        
'cua-resize-rectangle-right)
+  (define-key cua--rectangle-keymap [remap right-char]          
'cua-resize-rectangle-right)
   (define-key cua--rectangle-keymap [remap backward-char]       
'cua-resize-rectangle-left)
+  (define-key cua--rectangle-keymap [remap left-char]           
'cua-resize-rectangle-left)
   (define-key cua--rectangle-keymap [remap next-line]           
'cua-resize-rectangle-down)
   (define-key cua--rectangle-keymap [remap previous-line]       
'cua-resize-rectangle-up)
   (define-key cua--rectangle-keymap [remap end-of-line]         
'cua-resize-rectangle-eol)

=== modified file 'lisp/play/blackbox.el'
--- a/lisp/play/blackbox.el     2012-09-01 01:04:26 +0000
+++ b/lisp/play/blackbox.el     2012-09-05 07:05:56 +0000
@@ -97,7 +97,9 @@
   (let ((map (make-keymap)))
     (suppress-keymap map t)
     (blackbox-redefine-key map 'backward-char 'bb-left)
+    (blackbox-redefine-key map 'left-char 'bb-left)
     (blackbox-redefine-key map 'forward-char 'bb-right)
+    (blackbox-redefine-key map 'right-char 'bb-right)
     (blackbox-redefine-key map 'previous-line 'bb-up)
     (blackbox-redefine-key map 'next-line 'bb-down)
     (blackbox-redefine-key map 'move-end-of-line 'bb-eol)

=== modified file 'lisp/progmodes/flymake.el'
--- a/lisp/progmodes/flymake.el 2012-07-14 12:02:22 +0000
+++ b/lisp/progmodes/flymake.el 2012-09-05 07:05:56 +0000
@@ -977,6 +977,9 @@
 ;;   :type '(repeat (string number number number))
 ;;)
 
+(defvar flymake-warning-re "^[wW]arning"
+  "Regexp matching against err-text to detect a warning.")
+
 (defun flymake-parse-line (line)
   "Parse LINE to see if it is an error or warning.
 Return its components if so, nil otherwise."
@@ -997,7 +1000,7 @@
                                  (match-string (nth 4 (car patterns)) line)
                                (flymake-patch-err-text (substring line 
(match-end 0)))))
          (or err-text (setq err-text "<no error text>"))
-         (if (and err-text (string-match "^[wW]arning" err-text))
+         (if (and err-text (string-match flymake-warning-re err-text))
              (setq err-type "w")
            )
          (flymake-log 3 "parse line: file-idx=%s line-idx=%s file=%s line=%s 
text=%s" file-idx line-idx

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2012-08-28 16:01:59 +0000
+++ b/lisp/progmodes/sh-script.el       2012-09-05 07:05:56 +0000
@@ -1062,21 +1062,22 @@
               (backward-char 1))
             (when (eq (char-before) ?|)
               (backward-char 1) t)))
-      (when (progn (backward-char 2)
-                   (if (> start (line-end-position))
-                       (put-text-property (point) (1+ start)
-                                          'syntax-multiline t))
-                   ;; FIXME: The `in' may just be a random argument to
-                   ;; a normal command rather than the real `in' keyword.
-                   ;; I.e. we should look back to try and find the
-                   ;; corresponding `case'.
-                   (and (looking-at ";[;&]\\|\\_<in")
-                        ;; ";; esac )" is a case that looks like a case-pattern
-                        ;; but it's really just a close paren after a case
-                        ;; statement.  I.e. if we skipped over `esac' just now,
-                        ;; we're not looking at a case-pattern.
-                        (not (looking-at "..[ \t\n]+esac[^[:word:]_]"))))
-        sh-st-punc))))
+      (and (> (point) (1+ (point-min)))
+           (progn (backward-char 2)
+                  (if (> start (line-end-position))
+                      (put-text-property (point) (1+ start)
+                                         'syntax-multiline t))
+                  ;; FIXME: The `in' may just be a random argument to
+                  ;; a normal command rather than the real `in' keyword.
+                  ;; I.e. we should look back to try and find the
+                  ;; corresponding `case'.
+                  (and (looking-at ";[;&]\\|\\_<in")
+                       ;; ";; esac )" is a case that looks like a case-pattern
+                       ;; but it's really just a close paren after a case
+                       ;; statement.  I.e. if we skipped over `esac' just now,
+                       ;; we're not looking at a case-pattern.
+                       (not (looking-at "..[ \t\n]+esac[^[:word:]_]"))))
+           sh-st-punc))))
 
 (defun sh-font-lock-backslash-quote ()
   (if (eq (save-excursion (nth 3 (syntax-ppss (match-beginning 0)))) ?\')

=== modified file 'lisp/textmodes/picture.el'
--- a/lisp/textmodes/picture.el 2012-04-22 13:58:00 +0000
+++ b/lisp/textmodes/picture.el 2012-09-05 07:05:56 +0000
@@ -612,13 +612,15 @@
     (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)
     (define-key map [remap completion-separator-self-insert-autofilling]
-      'picture-self-insert)
+                         'picture-self-insert)
     (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.
     (define-key map [remap backward-delete-char-untabify]
       'picture-backward-clear-column)
     (define-key map [remap delete-backward-char] 
'picture-backward-clear-column)