summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-03-11 17:29:30 -0800
committerDan Nicolaescu <dann@ics.uci.edu>2010-03-11 17:29:30 -0800
commit855a22946bfc123649647656af225ec846a92704 (patch)
tree8c85ce5176832cd435e4dd22c71a8a911c396d2b /lisp/files.el
parent00fe2df1962ff4390d0db0a6fc83156b659a87dc (diff)
downloademacs-855a22946bfc123649647656af225ec846a92704.tar.gz
Add support for shelving snapshots and for showing shelves.
* vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point) (vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot): New functions. (vc-bzr-shelve-map, vc-bzr-shelve-menu-map) (vc-bzr-extra-menu-map): Map them.
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el
index f0a8d72d3f0..99fa7ddf1b5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2269,7 +2269,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
("\\.dtd\\'" . sgml-mode)
("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
("\\.js\\'" . js-mode) ; javascript-mode would be better
- ("\\.[ds]?v\\'" . verilog-mode)
+ ("\\.[ds]?vh?\\'" . verilog-mode)
;; .emacs or .gnus or .viper following a directory delimiter in
;; Unix, MSDOG or VMS syntax.
("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)