mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-12 09:00:40 -08:00
Code Issues Projects Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Jim Blandy 1992-07-17 22:17:57 +00:00
parent c0acc3e1cd
commit e373f20110
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/files.el
View file

@ -327,10 +327,18 @@ otherwise a string <2> or <3> or ... is appended to get an unused name."
Choose the buffer's name using generate-new-buffer-name." Choose the buffer's name using generate-new-buffer-name."
(get-buffer-create (generate-new-buffer-name name))) (get-buffer-create (generate-new-buffer-name name)))
(defconst automount-dir-prefix "^/tmp_mnt/"
"Regexp to match the automounter prefix in a directory name.")
(defun abbreviate-file-name (filename) (defun abbreviate-file-name (filename)
"Return a version of FILENAME shortened using directory-abbrev-alist. "Return a version of FILENAME shortened using directory-abbrev-alist.
This also substitutes \"~\" for the user's home directory. This also substitutes \"~\" for the user's home directory.
See \\[describe-variable] directory-abbrev-alist RET for more information." See \\[describe-variable] directory-abbrev-alist RET for more information."
;; Get rid of the prefixes added by the automounter.
(if (and (string-match automount-dir-prefix filename)
(file-exists-p (file-name-directory
(substring filename (1- (match-end 0))))))
(setq filename (substring filename (1- (match-end 0)))))
(let ((tail directory-abbrev-alist)) (let ((tail directory-abbrev-alist))
(while tail (while tail
(if (string-match (car (car tail)) filename) (if (string-match (car (car tail)) filename)
@ -347,13 +355,9 @@ See \\[describe-variable] directory-abbrev-alist RET for more information."
If a buffer exists visiting FILENAME, return that one, but If a buffer exists visiting FILENAME, return that one, but
verify that the file has not changed since visited or saved. verify that the file has not changed since visited or saved.
The buffer is not selected, just returned to the caller." The buffer is not selected, just returned to the caller."
(setq filename (expand-file-name filename)) (setq filename
;; Get rid of the prefixes added by the automounter. (abbreviate-file-name
(if (and (string-match "^/tmp_mnt/" filename) (expand-file-name filename)))
(file-exists-p (file-name-directory
(substring filename (1- (match-end 0))))))
(setq filename (substring filename (1- (match-end 0)))))
(setq filename (abbreviate-file-name filename))
(if (file-directory-p filename) (if (file-directory-p filename)
(if find-file-run-dired (if find-file-run-dired
(dired-noselect filename) (dired-noselect filename)

2
lisp/progmodes/etags.el
View file

@ -164,7 +164,7 @@ file the tag was in."
default-directory) default-directory)
t) t)
current-prefix-arg)) current-prefix-arg))
(setq file (expand-file-name file)) (setq file (abbreviate-file-name (expand-file-name file)))
(if (file-directory-p file) (if (file-directory-p file)
(setq file (expand-file-name "TAGS" file))) (setq file (expand-file-name "TAGS" file)))
(if local (if local

11
src/xfns.c
View file

@ -1671,6 +1671,17 @@ x_window (f)
class_hints.res_class = EMACS_CLASS; class_hints.res_class = EMACS_CLASS;
XSetClassHint (x_current_display, f->display.x->window_desc, &class_hints); XSetClassHint (x_current_display, f->display.x->window_desc, &class_hints);
/* x_set_name normally ignores requests to set the name if the
requested name is the same as the current name. This is the one
place where that assumption isn't correct; f->name is set, but
the X server hasn't been told. */
{
Lisp_Object name = f->name;
f->name = Qnil;
x_set_name (f, name, Qnil);
}
XDefineCursor (XDISPLAY f->display.x->window_desc, XDefineCursor (XDISPLAY f->display.x->window_desc,
f->display.x->text_cursor); f->display.x->text_cursor);
UNBLOCK_INPUT; UNBLOCK_INPUT;