From 1712cca561f20620cfdbf5603a96f2d00d1283b1 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 21 Oct 2005 06:32:05 +0000 Subject: [PATCH] (sh-font-lock-syntactic-keywords): Make $@ and $? into sexps. --- lisp/ChangeLog | 50 +++++++++++++++++++++++++++++-------- lisp/ChangeLog.10 | 2 +- lisp/progmodes/sh-script.el | 2 ++ 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2959c69da42..c777941fbba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,19 @@ +2005-10-21 Stefan Monnier + + * progmodes/sh-script.el (sh-font-lock-syntactic-keywords): Make $@ + and $? into sexps. + + * font-lock.el (font-lock-compile-keywords): Add a help-echo to the + warning face on open-paren-in-column-0. + + * emacs-lisp/syntax.el (syntax-ppss-flush-cache): Fix corner + boundary case. Fix typo. + Suggested by Martin Rudalics . + 2005-10-21 Carsten Dominik * textmodes/org.el: (org-combined-agenda-icalendar-file) - (org-icalendar-include-todo, org-icalendar-combined-name): New - options. + (org-icalendar-include-todo, org-icalendar-combined-name): New options. (org-export-icalendar-this-file) (org-export-icalendar-all-agenda-files) (org-export-icalendar-combine-agenda-files): New commands. @@ -12,8 +23,7 @@ (org-read-date, org-goto-calendar) (org-agenda-goto-calendar): Inhibit displaying diary entries by call to `calendar'. - (orgtbl-setup): Removed the :keys arguments from the menu - description. + (orgtbl-setup): Remove the :keys arguments from the menu description. (org-after-save-iCalendar-file-hook): New variable. 2005-10-21 Kenichi Handa @@ -26,6 +36,13 @@ * net/ange-ftp.el (ange-ftp-date-regexp): Handle also the case no group id is given. +2005-10-20 Stefan Monnier + + * progmodes/sh-script.el (sh-escaped-line-re): New var. + (sh-here-doc-open-re, sh-font-lock-close-heredoc): Use it. + (sh-font-lock-open-heredoc): Try to properly handle heredoc starters + whose line is either continued or ends with a comment. + 2005-10-20 Romain Francoise * net/rcirc.el (with-rcirc-process-buffer): Move above its first user. @@ -130,13 +147,12 @@ 2005-10-20 Reiner Steib - * textmodes/org.el (org-level-color-stars-only): Fix typo in doc - string. + * textmodes/org.el (org-level-color-stars-only): Fix typo in docstring. 2005-10-20 Eli Zaretskii - * makefile.w32-in ($(lisp)/mh-e/mh-loaddefs.el): Bind - find-file-suppress-same-file-warnings to t, to avoid warnings due + * makefile.w32-in ($(lisp)/mh-e/mh-loaddefs.el): + Bind find-file-suppress-same-file-warnings to t, to avoid warnings due to different drive letter case in D:/foo/bar.el vs d:/foo/bar.el. 2005-10-20 Kim F. Storm @@ -148,6 +164,18 @@ (ido-make-file-list): Don't rotate list at tramp root to avoid triggering tramp file handler for expand-file-name via get-file-buffer. +2005-10-19 Stefan Monnier + + * simple.el (eval-expression-print-format): Put the char-string + inside the parenthesis, like the other alternative notations. + (kill-new): Use push. + (copy-to-buffer): Use with-current-buffer. + (completion-setup-function): Simplify. + (minibuffer-local-must-match-map): Don't add redundant bindings which + are already present in its parent (minibuffer-local-completion-map). + + * savehist.el (savehist-coding-system): Revert to checking XEmacs. + 2005-10-19 Jay Belanger * calc/calc-units.el (math-standard-units): Add units, adjust @@ -167,6 +195,8 @@ 2005-10-18 Stefan Monnier + * savehist.el (savehist-load): Revert to checking XEmacs. + * textmodes/conf-mode.el: Don't use font-lock-defaults-alist. Various docstring and line-width fixups. (conf-mode): Use cond. @@ -291,8 +321,7 @@ * progmodes/gdb-ui.el (gdb-var-create-handler): Make watch expressions display in speedbar for all buffers when debugging. - (gdb-speedbar-expand-node): Ensure node contraction is always - updated. + (gdb-speedbar-expand-node): Ensure node contraction is always updated. * speedbar.el (speedbar-set-mode-line-format): Indent properly. (speedbar-insert-button, speedbar-make-button): @@ -416,7 +445,6 @@ * progmodes/pascal.el (pascal-complete-word) (pascal-show-completions): Ditto. - * textmodes/bibtex.el (bibtex-complete-internal): Ditto. * simple.el (completion-common-substring): New variable. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 6467fef4e72..51cda269238 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -14639,7 +14639,7 @@ * font-lock.el (font-lock-defaults, font-lock-defaults-alist) (font-lock-multiline, font-lock-fontified, font-lock-mode) (turn-on-font-lock, font-lock-add-keywords, global-font-lock-mode) - (font-lock-global-modes): Moved to font-core.el. + (font-lock-global-modes): Move to font-core.el. (font-lock-set-defaults-1): Partially moved to font-core.el. * font-core.el: New file, with functions taken from font-lock.el. diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 6d4572a43f8..2c4543a72fc 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -997,6 +997,8 @@ Point is at the beginning of the next line." ;; The list of special chars is taken from the single-unix spec ;; of the shell command language (under `quoting') but with `$' removed. `(("[^|&;<>()`\\\"' \t\n]\\(#+\\)" 1 ,sh-st-symbol) + ;; Make sure $@ and @? are correctly recognized as sexps. + ("\\$\\([?@]\\)" 1 ,sh-st-symbol) ;; Find HEREDOC starters and add a corresponding rule for the ender. (sh-font-lock-here-doc (2 (sh-font-lock-open-heredoc -- 2.39.5