aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-02-18 21:56:47 +0000
committerStefan Monnier2005-02-18 21:56:47 +0000
commit9be92b96058e3dfe74185fc627f73117686e095e (patch)
treefffbe3065b1a08391c8c7ea9678e40b3f6c851a9
parentf102186f2d4793c5f7b36f81a221e78a4730d2c7 (diff)
downloademacs-9be92b96058e3dfe74185fc627f73117686e095e.tar.gz
emacs-9be92b96058e3dfe74185fc627f73117686e095e.zip
(log-view-message-re): Fix up Subversion regexp.
-rw-r--r--lisp/ChangeLog15
-rw-r--r--lisp/log-view.el6
2 files changed, 12 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 473afa9040d..7207d267f2c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-02-18 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * log-view.el (log-view-message-re): Fix up Subversion regexp.
4
12005-02-18 David Kastrup <dak@gnu.org> 52005-02-18 David Kastrup <dak@gnu.org>
2 6
3 * progmodes/meta-mode.el (meta-mark-active): Fix condition to just 7 * progmodes/meta-mode.el (meta-mark-active): Fix condition to just
@@ -93,8 +97,8 @@
93 97
942005-02-15 Lute Kamstra <lute@gnu.org> 982005-02-15 Lute Kamstra <lute@gnu.org>
95 99
96 * emacs-lisp/lisp-mode.el (lisp-mode-variables): Add 100 * emacs-lisp/lisp-mode.el (lisp-mode-variables):
97 ;;;###autoload to `outline-regexp'. Suggested by Stefan Monnier 101 Add ;;;###autoload to `outline-regexp'. Suggested by Stefan Monnier
98 <monnier@iro.umontreal.ca> 102 <monnier@iro.umontreal.ca>
99 (lisp-outline-level): Improve efficiency. Suggested by David 103 (lisp-outline-level): Improve efficiency. Suggested by David
100 Kastrup <dak@gnu.org>. 104 Kastrup <dak@gnu.org>.
@@ -169,7 +173,7 @@
169 * simple.el (eval-expression-print-format): 173 * simple.el (eval-expression-print-format):
170 Avoid warning about edebug-active. 174 Avoid warning about edebug-active.
171 175
172 * help.el (help-for-help-internal): Renamed from help-for-help. 176 * help.el (help-for-help-internal): Rename from help-for-help.
173 (help-for-help): Define with defalias. 177 (help-for-help): Define with defalias.
174 178
175 * font-core.el (font-lock-default-function): Use with-no-warnings. 179 * font-core.el (font-lock-default-function): Use with-no-warnings.
@@ -202,7 +206,7 @@
2022005-02-09 Nick Roberts <nickrob@snap.net.nz> 2062005-02-09 Nick Roberts <nickrob@snap.net.nz>
203 207
204 * progmodes/gdb-ui.el (gdb-location-list): New variable. 208 * progmodes/gdb-ui.el (gdb-location-list): New variable.
205 (gdb-cdir): Delete 209 (gdb-cdir): Delete.
206 (gdb-info-breakpoints-custom, gdb-goto-breakpoint) 210 (gdb-info-breakpoints-custom, gdb-goto-breakpoint)
207 (gdb-source-info): Treat case when source file is in another 211 (gdb-source-info): Treat case when source file is in another
208 directory properly. 212 directory properly.
@@ -213,8 +217,7 @@
213 * calc/calc-prog.el (calc-write-parse-table-part) 217 * calc/calc-prog.el (calc-write-parse-table-part)
214 (calc-fix-token-name): Fix a check for language type. 218 (calc-fix-token-name): Fix a check for language type.
215 219
216 * calc/calccomp.el (math-compose-expr): Fix a check for language 220 * calc/calccomp.el (math-compose-expr): Fix a check for language type.
217 type.
218 221
2192005-02-07 Andre Spiegel <spiegel@gnu.org> 2222005-02-07 Andre Spiegel <spiegel@gnu.org>
220 223
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 51ca8907db8..c153cbdbb60 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -1,6 +1,6 @@
1;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output 1;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
2 2
3;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. 3;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
4 4
5;; Author: Stefan Monnier <monnier@cs.yale.edu> 5;; Author: Stefan Monnier <monnier@cs.yale.edu>
6;; Keywords: rcs sccs cvs log version-control 6;; Keywords: rcs sccs cvs log version-control
@@ -85,7 +85,7 @@
85 "\\|SCCS/s\\.\\(.+\\):" 85 "\\|SCCS/s\\.\\(.+\\):"
86 "\\)\n")) 86 "\\)\n"))
87;; In RCS, a locked revision will look like "revision N.M\tlocked by: FOO". 87;; In RCS, a locked revision will look like "revision N.M\tlocked by: FOO".
88(defconst log-view-message-re "^\\(revision \\([.0-9]+\\)\\(?:\t.*\\)?\\|rev \\([0-9]+\\): .*\\|D \\([.0-9]+\\) .*\\)$") 88(defconst log-view-message-re "^\\(revision \\([.0-9]+\\)\\(?:\t.*\\)?\\|r\\([0-9]+\\) | .* | .*\\|D \\([.0-9]+\\) .*\\)$")
89 89
90(defconst log-view-font-lock-keywords 90(defconst log-view-font-lock-keywords
91 `((,log-view-file-re 91 `((,log-view-file-re
@@ -206,5 +206,5 @@ were the region starts and ends."
206 206
207(provide 'log-view) 207(provide 'log-view)
208 208
209;;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f 209;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f
210;;; log-view.el ends here 210;;; log-view.el ends here