[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Stefan Monnier]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.8401 emacs/lisp/ChangeLog:1.8402
*** emacs/lisp/ChangeLog:1.8401 Fri Oct 21 05:54:23 2005
--- emacs/lisp/ChangeLog        Fri Oct 21 06:30:58 2005
***************
*** 1,8 ****
  2005-10-21  Carsten Dominik  <address@hidden>
  
        * textmodes/org.el: (org-combined-agenda-icalendar-file)
!       (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.
--- 1,19 ----
+ 2005-10-21  Stefan Monnier  <address@hidden>
+ 
+       * 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 <address@hidden>.
+ 
  2005-10-21  Carsten Dominik  <address@hidden>
  
        * textmodes/org.el: (org-combined-agenda-icalendar-file)
!       (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,19 ****
        (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.
        (org-after-save-iCalendar-file-hook): New variable.
  
  2005-10-21  Kenichi Handa  <address@hidden>
--- 23,29 ----
        (org-read-date, org-goto-calendar)
        (org-agenda-goto-calendar): Inhibit displaying diary entries by
        call to `calendar'.
!       (orgtbl-setup): Remove the :keys arguments from the menu description.
        (org-after-save-iCalendar-file-hook): New variable.
  
  2005-10-21  Kenichi Handa  <address@hidden>
***************
*** 26,31 ****
--- 36,48 ----
        * net/ange-ftp.el (ange-ftp-date-regexp): Handle also the case no
        group id is given.
  
+ 2005-10-20  Stefan Monnier  <address@hidden>
+ 
+       * 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  <address@hidden>
  
        * net/rcirc.el (with-rcirc-process-buffer): Move above its first user.
***************
*** 55,61 ****
--- 72,82 ----
        (allout-situate-encryption-key-verifier)
        (allout-get-encryption-key-verifier, allout-verify-key)
        (allout-next-topic-pending-encryption)
+ <<<<<<< ChangeLog
+       (allout-encrypt-decrypted, allout-encrypted-type-prefix): New funs.
+ =======
        (allout-encrypt-decrypted, allout-encrypted-type-prefix): New funcs.
+ >>>>>>> 1.8400
        (outline-topic-encryption-bullet, outline-default-encryption-scheme)
        (outline-key-verifier-handling, outline-key-hint-handling)
        (outline-encrypt-unencrypted-on-saves): New defcustoms.
***************
*** 71,83 ****
--- 92,115 ----
        New functions, implement the mechanism.
        (outlineify-sticky): Use the file vars mechanism.
        (allout-inhibit-protection, allout-during-write-cue)
+ <<<<<<< ChangeLog
+       (allout-override-protect, allout-before-change-protect): Remove.
+       (allout-flag-region, allout-open-topic): Revise to adjust
+       read-only text.
+       (allout-open-line-not-read-only): Add to facilitate read-only
+ =======
        (allout-override-protect, allout-before-change-protect): Remove.
        (allout-flag-region, allout-open-topic): Adjust read-only text.
        (allout-open-line-not-read-only): Add to facilitate read-only
+ >>>>>>> 1.8400
        text based protection.
        (allout-kill-line): Revise to adjust read-only text, clue the
        user about the inhibition.
+ <<<<<<< ChangeLog
+       (allout-unprotected): Robustify with an unwind-protect.
+ =======
        (allout-unprotected): Use unwind-protect.
+ >>>>>>> 1.8400
        (allout-shift-in, allout-shift-out): Disallow manually shifting a
        topic deeper than the offspring depth of the previous topic -
        avoiding confusing "containment discontinuities".
***************
*** 96,102 ****
--- 128,138 ----
        (allout-hide-current-entry, allout-show-current-entry): Use the
        revised version.
        (allout-old-expose-topic): Solidify deprecation.
+ <<<<<<< ChangeLog
+       (allout-end-of-subtree): Add, so we can span concealed as well
+ =======
        (allout-end-of-subtree): Add so we can span concealed as well
+ >>>>>>> 1.8400
        as visible topics.
        (allout-end-of-current-subtree): Use `allout-end-of-subtree'.
        (allout-end-of-current-heading): Tweak to just respect the first line.
***************
*** 107,116 ****
--- 143,160 ----
        (allout-mode, allout-init): Miscellaneous docstring and
        operational refinements, as well as hookups of new encryption stuff.
        (allout-beginning-of-current-entry): Now works as advertised.
+ <<<<<<< ChangeLog
+       (allout-end-of-current-entry): Relief of superfluous
+       allout-show-entry.
+       (allout-isearch-rectification): Refine condition for isearching
+       (allout-isearch-abort, allout-enwrap-isearch).
+       (allout-flag-region, my-region-active-p): Relocate some macros.
+ =======
        (allout-end-of-current-entry): Remove of superfluous allout-show-entry.
        (allout-isearch-rectification): Refine condition for isearching.
        (allout-isearch-abort, allout-enwrap-isearch)
        (allout-flag-region, my-region-active-p): Relocate some macros.
+ >>>>>>> 1.8400
        (allout-title): Fallback title is '(buffer-name)', not
        non-existing '(current-buffer-name)'.
        (subst-char-in-string): Define if absent (for some XEmacs versions).
***************
*** 130,142 ****
  
  2005-10-20  Reiner Steib  <address@hidden>
  
!       * textmodes/org.el (org-level-color-stars-only): Fix typo in doc
!       string.
  
  2005-10-20  Eli Zaretskii  <address@hidden>
  
!       * 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  <address@hidden>
--- 174,185 ----
  
  2005-10-20  Reiner Steib  <address@hidden>
  
!       * textmodes/org.el (org-level-color-stars-only): Fix typo in docstring.
  
  2005-10-20  Eli Zaretskii  <address@hidden>
  
!       * 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  <address@hidden>
***************
*** 148,153 ****
--- 191,208 ----
        (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  <address@hidden>
+ 
+       * 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  <address@hidden>
  
        * calc/calc-units.el (math-standard-units): Add units, adjust
***************
*** 167,172 ****
--- 222,229 ----
  
  2005-10-18  Stefan Monnier  <address@hidden>
  
+       * 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,298 ****
  
        * 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.
  
        * speedbar.el (speedbar-set-mode-line-format): Indent properly.
        (speedbar-insert-button, speedbar-make-button):
--- 348,354 ----
  
        * 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.
  
        * speedbar.el (speedbar-set-mode-line-format): Indent properly.
        (speedbar-insert-button, speedbar-make-button):
***************
*** 415,421 ****
  
        * progmodes/pascal.el (pascal-complete-word)
        (pascal-show-completions): Ditto.
- 
  
        * textmodes/bibtex.el (bibtex-complete-internal): Ditto.
  
--- 471,476 ----