From a622451fdc808f526bd7b1bb49d9ca5689486b66 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Thu, 12 Oct 2000 13:39:32 +0000 Subject: [PATCH] (normal-top-level-add-subdirs-to-load-path): Use character class, not ASCII when matching file names. (fancy-splash-head): Add trailing slash to URL. (command-line): Don't require XPM support for toolbar. --- lisp/ChangeLog | 7 +++++-- lisp/startup.el | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20cd22240d1..4be6a98ad08 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2000-10-12 Dave Love + * startup.el (normal-top-level-add-subdirs-to-load-path): Use + character class, not ASCII when matching file names. + (fancy-splash-head): Add trailing slash to URL. + (command-line): Don't require XPM support for toolbar. + * progmodes/cperl-mode.el (cperl-tips-faces): Doc fix. (cperl-invalid-face): Revert last change. (cperl-init-faces): Quote cperl-invalid-face. @@ -102,8 +107,6 @@ (tool-bar-add-item-from-menu): Don't favour XPM icons on mono display. - * startup.el (command-line): Don't require XPM support for toolbar. - * toolbar/attach.pbm, toolbar/cancel.pbm, toolbar/close.pbm: * toolbar/copy.pbm, toolbar/cut.pbm, toolbar/exit.pbm: * toolbar/fld_open.pbm, toolbar/help.pbm, toolbar/home.pbm: diff --git a/lisp/startup.el b/lisp/startup.el index a6aae252045..4e478f5882f 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -360,7 +360,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." (cons attrs normal-top-level-add-subdirs-inode-list)) (while contents (unless (member (car contents) '("." ".." "RCS" "CVS")) - (when (and (string-match "\\`[a-zA-Z0-9]" (car contents)) + (when (and (string-match "\\`[[:alnum:]]" (car contents)) ;; Avoid doing a `stat' when it isn't necessary ;; because that can cause trouble when an NFS server ;; is down. @@ -656,7 +656,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." ;; If frame was created with a tool bar, switch tool-bar-mode on. (when (and (not noninteractive) (memq window-system '(x w32)) - (image-type-available-p 'xpm) (> (frame-parameter nil 'tool-bar-lines) 0)) (tool-bar-mode t)) @@ -943,11 +942,11 @@ where FACE is a valid face specification, as it can be used with ;; Insert the image with a help-echo and a keymap. (let ((map (make-sparse-keymap)) - (help-echo "mouse-2: browse http://www.gnu.org")) + (help-echo "mouse-2: browse http://www.gnu.org/")) (define-key map [mouse-2] (lambda () (interactive) - (browse-url "http://www.gnu.org") + (browse-url "http://www.gnu.org/") (throw 'exit nil))) (define-key map [down-mouse-2] 'ignore) (define-key map [up-mouse-2] 'ignore) -- 2.39.5