diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-07-17 07:52:00 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-07-17 07:52:00 -0400 |
| commit | 4dc7c8d5795458e89d19b59f64760e155c2cd70b (patch) | |
| tree | 2eb1ef73d69102f0ebee4e39056078adcdd49529 /lisp | |
| parent | 2143fa32671374cdef26fdb24355bf690728a344 (diff) | |
| parent | fbf31a9c2c08c86a7ab490cb7b920245b829a61d (diff) | |
| download | emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.tar.gz emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.tar.bz2 emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.zip | |
Merge from emacs-24
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 3 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 8 |
4 files changed, 24 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 04cf8291dff..1648aa3bea7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> + * progmodes/sh-script.el (sh-syntax-propertize-function): Fix last + change (bug#11826). + +2012-07-17 Glenn Morris <rgm@gnu.org> +2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> + * progmodes/cc-engine.el (c-forward-sws, c-backward-sws): Avoid spuriously marking the buffer as modified because of c-is-sws. @@ -340,6 +346,12 @@ read-file-name-completion-ignore-case is non-nil. Don't use case-fold-search for this purpose. (Bug#11827) +2012-07-17 Andreas Schwab <schwab@linux-m68k.org> + + * calendar/cal-dst.el (calendar-current-time-zone): + Return calendar-current-time-zone-cache if non-nil. + +2012-07-17 Masatake YAMATO <yamato@redhat.com> 2012-07-06 Andreas Schwab <schwab@linux-m68k.org> * calendar/cal-dst.el (calendar-current-time-zone): diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 41966497607..6c1d2b9b624 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2012-07-17 Andreas Schwab <schwab@linux-m68k.org> + + * shr.el (shr-expand-url): Handle URL starting with `//'. + +2012-07-17 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change) 2012-07-13 Chong Yidong <cyd@gnu.org> * smime.el (smime-certificate-info): Set buffer-read-only directly, diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index bf6e57e8d79..e7a6c5d2081 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -484,6 +484,9 @@ size, and full-buffer size." (string-match "\\`[a-z]*:" url) (not shr-base)) url) + ((and (string-match "\\`//" url) + (string-match "\\`[a-z]*:" shr-base)) + (concat (match-string 0 shr-base) url)) ((and (not (string-match "/\\'" shr-base)) (not (string-match "\\`/" url))) (concat shr-base "/" url)) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 034cfa4b394..be664c6fc6e 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1096,12 +1096,12 @@ subshells can nest." (")" (0 (sh-font-lock-paren (match-beginning 0)))) ;; Highlight (possibly nested) subshells inside "" quoted ;; regions correctly. - ("\"\\(?:\\(?:[^\\\"]\\|\\)*?[^\\]\\(?:\\\\\\\\\\)*\\)??\\(\\$(\\|`\\)" + ("\"\\(?:\\(?:[^\\\"]\\|\\\\.\\)*?\\)??\\(\\$(\\|`\\)" (1 (ignore - ;; Save excursion because we want to also apply other - ;; syntax-propertize rules within the affected region. - (if (nth 8 (syntax-ppss)) + (if (nth 8 (save-excursion (syntax-ppss (match-beginning 0)))) (goto-char (1+ (match-beginning 0))) + ;; Save excursion because we want to also apply other + ;; syntax-propertize rules within the affected region. (save-excursion (sh-font-lock-quoted-subshell end))))))) (point) end)) |