diff options
| -rw-r--r-- | lisp/ChangeLog | 39 | ||||
| -rw-r--r-- | lisp/emacs-lisp/regexp-opt.el | 3 |
2 files changed, 41 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 03159b7e63..c46a4a94cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,42 @@ +2000-05-10 Stefan Monnier <[email protected]> + + * emacs-lisp/regexp-opt.el (regexp-opt-depth): Fix regexp. + + * subr.el (add-hook, remove-hook): Make hook buffer-local if needed.. + (add-minor-mode): Don't make the variable buffer-local and add a + reference to define-minor-mode in the docstring. + + * pcvs.el (cvs-cleanup-collection): Remove obsolete code for + HEADER/FOOTER and fix bug with trailing empty directory. + (cvs-append-to-ignore): Use vc-editable-p if available. + (cvs-dir-member-p): Remove obsolete code for HEADER/FOOTER. + (vc-do-command): Tweak advice to handle the new VC. + + * log-view.el (log-view-goto-rev): New function for the new VC. + (log-view-minor-wrap): Use mark-active. + + * log-edit.el (cvs-changelog-full-paragraphs): Mark obsolete. + (log-edit-changelog-full-paragraphs): New var. + (log-edit-insert-changelog): Remove a lonely leading `* file'. + (log-edit-narrow-changelog, log-edit-changelog-paragraph) + (log-edit-changelog-subparagraph, log-edit-changelog-entry) + (log-edit-changelog-ours-p, log-edit-changelog-entries) + (log-edit-changelog-insert-entries, log-edit-insert-changelog-entries): + Replace the `cvs' prefix with `log-edit'. + + * iswitchb.el (iswitchb-completion-help): Unquote lambda. + + * diff-mode.el (diff-font-lock-keywords): Recognize comments. + (diff-font-lock-defaults): Explicitly turn off multiline. + (diff-end-of-hunk): Handle comments and fix end-of-buffer bug. + (diff-ediff-patch): Fix call to ediff-patch-file. + (diff-end-of-file, diff-reverse-direction, diff-fixup-modifs): + Handle comments. + + * frame.el (automatic-hscrolling): Typo. + + * cvs-status.el (cvs-status-minor-wrap): Use mark-active. + 2000-05-09 Sam Steingold <[email protected]> * apropos.el (apropos-print): use `describe-face' instead of diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index 8c77e9ea5c..a7ff7b54a5 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -112,7 +112,8 @@ in REGEXP." (string-match regexp "") ;; Count the number of open parentheses in REGEXP. (let ((count 0) start) - (while (string-match "\\\\\\(\\\\\\\\\\)*([^?]" regexp start) + (while (string-match "\\(\\`\\|[^\\]\\)\\\\\\(\\\\\\\\\\)*([^?]" + regexp start) (setq count (1+ count) start (match-end 0))) count))) |