2 files changed, 74 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ae544ea1fc..69458392127 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-25  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * vms-patch.el (vms-magic-right-square-brace, vms-magic-colon):
+        New funcs.  In minibuffer-local-completion-map bind `]', `/'
+        and `:' to them.
+
 2005-03-24  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * progmodes/dcl-mode.el (dcl-imenu-generic-expression):
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index 3d8a9c59647..98f33c2bf6d 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -147,7 +147,7 @@ spawned Emacs and doing things like \"emacs -l myfile.el -f doit\""
                         (< 32 (setq this-char (aref args end)))
                         (> 127 this-char))
               (setq end (1+ end)))
-            (setq command-line-args (append 
+            (setq command-line-args (append
                                      command-line-args
                                      (list (substring args beg end))))
             (setq beg (1+ end)))
@@ -193,4 +193,71 @@ following bindings are established.
 All other Emacs commands are still available."
   t)
 
+;;;
+;;; Filename handling in the minibuffer
+;;;
+(defun vms-magic-right-square-brace ()
+  "\
+Insert a right square brace, but do other things first depending on context.
+During filename completion, when point is at the end of the line and the
+character before is not a right square brace, do one of three things before
+inserting the brace:
+ - If there are already two left square braces preceding, do nothing special.
+ - If there is a previous right-square-brace, convert it to dot.
+ - If the character before is dot, delete it.
+Additionally, if the preceding chars are right-square-brace followed by
+either \"-\" or \"..\", strip one level of directory hierarchy."
+  (interactive)
+  (when (and minibuffer-completing-file-name
+             (= (point) (point-max))
+             (not (= 93 (char-before))))
+    (cond
+     ;; Avoid clobbering: user:[one.path][another.path
+     ((search-backward "[" (field-beginning) t 2))
+     ((search-backward "]" (field-beginning) t)
+      (delete-char 1)
+      (insert ".")
+      (goto-char (point-max)))
+     ((= ?. (char-before))
+      (delete-char -1)))
+    (goto-char (point-max))
+    (let ((specs '(".." "-"))
+          (pmax (point-max)))
+      (while specs
+        (let* ((up (car specs))
+               (len (length up))
+               (cut (- (point) len)))
+          (when (and (< (1+ len) pmax)
+                     (= ?. (char-before cut))
+                     (string= up (buffer-substring cut (point))))
+            (delete-char (- (1+ len)))
+            (while (not (let ((c (char-before)))
+                          (or (= ?. c) (= 91 c))))
+              (delete-char -1))
+            (when (= ?. (char-before)) (delete-char -1))
+            (setq specs nil)))
+        (setq specs (cdr specs)))))
+  (insert "]"))
+
+(defun vms-magic-colon ()
+  "\
+Insert a colon, but do other things first depending on context.
+During filename completion, when point is at the end of the line
+and the line contains a right square brace, remove all characters
+from the beginning of the line up to and including such brace.
+This enables one to type a new filespec without having to delete
+the old one."
+  (interactive)
+  (when (and minibuffer-completing-file-name
+             (= (point) (point-max))
+             (search-backward "]" (field-beginning) t))
+    (delete-region (field-beginning) (1+ (point)))
+    (goto-char (point-max)))
+  (insert ":"))
+
+(let ((m minibuffer-local-completion-map))
+  (define-key m "]" 'vms-magic-right-square-brace)
+  (define-key m "/" 'vms-magic-right-square-brace)
+  (define-key m ":" 'vms-magic-colon))
+
 ;;; vms-patch.el ends here