Commit 7e570fbf authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca

parents 1a1ecd2b f1220388
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-09-05 Leo Liu <sdl.web@gmail.com>
* progmodes/flymake.el (flymake-warning-re): New variable.
(flymake-parse-line): Use it.
2012-09-05 Glenn Morris <rgm@gnu.org>
* calendar/holidays.el (holiday-christian-holidays):
Rename an entry. (Bug#12289)
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-09-04 Stefan Monnier <monnier@iro.umontreal.ca> 2012-09-04 Stefan Monnier <monnier@iro.umontreal.ca>
   
* loadup.el: Load macroexp. Remove hack. * loadup.el: Load macroexp. Remove hack.
......
...@@ -250,7 +250,7 @@ See the documentation for `calendar-holidays' for details." ...@@ -250,7 +250,7 @@ See the documentation for `calendar-holidays' for details."
(if calendar-christian-all-holidays-flag (if calendar-christian-all-holidays-flag
(append (append
(holiday-fixed 1 6 "Epiphany") (holiday-fixed 1 6 "Epiphany")
(holiday-julian 12 25 "Eastern Orthodox Christmas") (holiday-julian 12 25 "Christmas (Julian calendar)")
(holiday-greek-orthodox-easter) (holiday-greek-orthodox-easter)
(holiday-fixed 8 15 "Assumption") (holiday-fixed 8 15 "Assumption")
(holiday-advent 0 "Advent"))))) (holiday-advent 0 "Advent")))))
......
...@@ -1423,7 +1423,9 @@ With prefix arg, indent to that column." ...@@ -1423,7 +1423,9 @@ With prefix arg, indent to that column."
(define-key cua--rectangle-keymap [remap set-mark-command] 'cua-toggle-rectangle-mark) (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 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 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 next-line] 'cua-resize-rectangle-down)
(define-key cua--rectangle-keymap [remap previous-line] 'cua-resize-rectangle-up) (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) (define-key cua--rectangle-keymap [remap end-of-line] 'cua-resize-rectangle-eol)
......
...@@ -97,7 +97,9 @@ ...@@ -97,7 +97,9 @@
(let ((map (make-keymap))) (let ((map (make-keymap)))
(suppress-keymap map t) (suppress-keymap map t)
(blackbox-redefine-key map 'backward-char 'bb-left) (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 'forward-char 'bb-right)
(blackbox-redefine-key map 'right-char 'bb-right)
(blackbox-redefine-key map 'previous-line 'bb-up) (blackbox-redefine-key map 'previous-line 'bb-up)
(blackbox-redefine-key map 'next-line 'bb-down) (blackbox-redefine-key map 'next-line 'bb-down)
(blackbox-redefine-key map 'move-end-of-line 'bb-eol) (blackbox-redefine-key map 'move-end-of-line 'bb-eol)
......
...@@ -977,6 +977,9 @@ from compile.el") ...@@ -977,6 +977,9 @@ from compile.el")
;; :type '(repeat (string number number number)) ;; :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) (defun flymake-parse-line (line)
"Parse LINE to see if it is an error or warning. "Parse LINE to see if it is an error or warning.
Return its components if so, nil otherwise." Return its components if so, nil otherwise."
...@@ -997,7 +1000,7 @@ Return its components if so, nil otherwise." ...@@ -997,7 +1000,7 @@ Return its components if so, nil otherwise."
(match-string (nth 4 (car patterns)) line) (match-string (nth 4 (car patterns)) line)
(flymake-patch-err-text (substring line (match-end 0))))) (flymake-patch-err-text (substring line (match-end 0)))))
(or err-text (setq err-text "<no error text>")) (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") (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 (flymake-log 3 "parse line: file-idx=%s line-idx=%s file=%s line=%s text=%s" file-idx line-idx
......
...@@ -1062,21 +1062,22 @@ subshells can nest." ...@@ -1062,21 +1062,22 @@ subshells can nest."
(backward-char 1)) (backward-char 1))
(when (eq (char-before) ?|) (when (eq (char-before) ?|)
(backward-char 1) t))) (backward-char 1) t)))
(when (progn (backward-char 2) (and (> (point) (1+ (point-min)))
(if (> start (line-end-position)) (progn (backward-char 2)
(put-text-property (point) (1+ start) (if (> start (line-end-position))
'syntax-multiline t)) (put-text-property (point) (1+ start)
;; FIXME: The `in' may just be a random argument to 'syntax-multiline t))
;; a normal command rather than the real `in' keyword. ;; FIXME: The `in' may just be a random argument to
;; I.e. we should look back to try and find the ;; a normal command rather than the real `in' keyword.
;; corresponding `case'. ;; I.e. we should look back to try and find the
(and (looking-at ";[;&]\\|\\_<in") ;; corresponding `case'.
;; ";; esac )" is a case that looks like a case-pattern (and (looking-at ";[;&]\\|\\_<in")
;; but it's really just a close paren after a case ;; ";; esac )" is a case that looks like a case-pattern
;; statement. I.e. if we skipped over `esac' just now, ;; but it's really just a close paren after a case
;; we're not looking at a case-pattern. ;; statement. I.e. if we skipped over `esac' just now,
(not (looking-at "..[ \t\n]+esac[^[:word:]_]")))) ;; we're not looking at a case-pattern.
sh-st-punc)))) (not (looking-at "..[ \t\n]+esac[^[:word:]_]"))))
sh-st-punc))))
(defun sh-font-lock-backslash-quote () (defun sh-font-lock-backslash-quote ()
(if (eq (save-excursion (nth 3 (syntax-ppss (match-beginning 0)))) ?\') (if (eq (save-excursion (nth 3 (syntax-ppss (match-beginning 0)))) ?\')
......
...@@ -612,13 +612,15 @@ Leaves the region surrounding the rectangle." ...@@ -612,13 +612,15 @@ Leaves the region surrounding the rectangle."
(define-key map [remap self-insert-command] 'picture-self-insert) (define-key map [remap self-insert-command] 'picture-self-insert)
(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] (define-key map [remap completion-separator-self-insert-command]
'picture-self-insert) 'picture-self-insert)
(define-key map [remap completion-separator-self-insert-autofilling] (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 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 backward-char] 'picture-backward-column)
(define-key map [remap left-char] 'picture-backward-column)
(define-key map [remap delete-char] 'picture-clear-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] (define-key map [remap backward-delete-char-untabify]
'picture-backward-clear-column) 'picture-backward-clear-column)
(define-key map [remap delete-backward-char] 'picture-backward-clear-column) (define-key map [remap delete-backward-char] 'picture-backward-clear-column)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment