Mercurial > hg > xemacs-beta
view lisp/paths.el @ 5882:bbe4146603db
Reduce regexp usage, now CL-oriented non-regexp code available, core Lisp
lisp/ChangeLog addition:
2015-04-01 Aidan Kehoe <kehoea@parhasard.net>
When calling #'string-match with a REGEXP without regular
expression special characters, call #'search, #'mismatch, #'find,
etc. instead, making our code less likely to side-effect other
functions' match data and a little faster.
* apropos.el (apropos-command):
* apropos.el (apropos):
Call (position ?\n ...) rather than (string-match "\n" ...) here.
* buff-menu.el:
* buff-menu.el (buffers-menu-omit-invisible-buffers):
Don't fire up the regexp engine just to check if a string starts
with a space.
* buff-menu.el (select-buffers-tab-buffers-by-mode):
Don't fire up the regexp engine just to compare mode basenames.
* buff-menu.el (format-buffers-tab-line):
* buff-menu.el (build-buffers-tab-internal): Moved to being a
label within the following.
* buff-menu.el (buffers-tab-items): Use the label.
* bytecomp.el (byte-compile-log-1):
Don't fire up the regexp engine just to look for a newline.
* cus-edit.el (get):
Ditto.
* cus-edit.el (custom-variable-value-create):
Ditto, but for a colon.
* descr-text.el (describe-text-sexp):
Ditto.
* descr-text.el (describe-char-unicode-data):
Use #'split-string-by-char given that we're just looking for a
semicolon.
* descr-text.el (describe-char):
Don't fire up the regexp engine just to look for a newline.
* disass.el (disassemble-internal):
Ditto.
* files.el (file-name-sans-extension):
Implement this using #'position.
* files.el (file-name-extension):
Correct this function's docstring, implement it in terms of
#'position.
* files.el (insert-directory):
Don't fire up the regexp engine to split a string by space; don't
reverse the list of switches, this is actually a longstand bug as
far as I can see.
* gnuserv.el (gnuserv-process-filter):
Use #'position here, instead of consing inside #'split-string
needlessly.
* gtk-file-dialog.el (gtk-file-dialog-update-dropdown):
Use #'split-string-by-char here, don't fire up #'split-string for
directory-sep-char.
* gtk-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* hyper-apropos.el (hyper-apropos-grok-functions):
* hyper-apropos.el (hyper-apropos-grok-variables):
Look for a newline using #'position rather than #'string-match in
these functions.
* info.el (Info-insert-dir):
* info.el (Info-insert-file-contents):
* info.el (Info-follow-reference):
* info.el (Info-extract-menu-node-name):
* info.el (Info-menu):
Look for fixed strings using #'position or #'search as appropriate
in this file.
* ldap.el (ldap-decode-string):
* ldap.el (ldap-encode-string):
#'encode-coding-string, #'decode-coding-string are always
available, don't check if they're fboundp.
* ldap.el (ldap-decode-address):
* ldap.el (ldap-encode-address):
Use #'split-string-by-char in these functions.
* lisp-mnt.el (lm-creation-date):
* lisp-mnt.el (lm-last-modified-date):
Don't fire up the regexp engine just to look for spaces in this file.
* menubar-items.el (default-menubar):
Use (not (mismatch ...)) rather than #'string-match here, for
simple regexp.
Use (search "beta" ...) rather than (string-match "beta" ...)
* menubar-items.el (sort-buffers-menu-alphabetically):
* menubar-items.el (sort-buffers-menu-by-mode-then-alphabetically):
* menubar-items.el (group-buffers-menu-by-mode-then-alphabetically):
Don't fire up the regexp engine to check if a string starts with
a space or an asterisk.
Use the more fine-grained results of #'compare-strings; compare
case-insensitively for the buffer menu.
* menubar-items.el (list-all-buffers):
* menubar-items.el (tutorials-menu-filter):
Use #'equal rather than #'string-equal, which, in this context,
has the drawback of not having a bytecode, and no redeeming
features.
* minibuf.el:
* minibuf.el (un-substitute-in-file-name):
Use #'count, rather than counting the occurences of $ using the
regexp engine.
* minibuf.el (read-file-name-internal-1):
Don't fire up the regexp engine to search for ?=.
* mouse.el (mouse-eval-sexp):
Check for newline with #'find.
* msw-font-menu.el (mswindows-reset-device-font-menus):
Split a string by newline with #'split-string-by-char.
* mule/japanese.el:
* mule/japanese.el ("Japanese"):
Use #'search rather than #'string-match; canoncase before
comparing; fix a bug I had introduced where I had been making case
insensitive comparisons where the case mattered.
* mule/korea-util.el (default-korean-keyboard):
Look for ?3 using #'find, not #'string-march.
* mule/korea-util.el (quail-hangul-switch-hanja):
Search for a fixed string using #'search.
* mule/mule-cmds.el (set-locale-for-language-environment):
#'position, #'substitute rather than #'string-match,
#'replace-in-string.
* newcomment.el (comment-make-extra-lines):
Use #'search rather than #'string-match for a simple string.
* package-get.el (package-get-remote-filename):
Use #'position when looking for ?@
* process.el (setenv):
* process.el (read-envvar-name):
Use #'position when looking for ?=.
* replace.el (map-query-replace-regexp):
Use #'split-string-by-char instead of using an inline
implementation of it.
* select.el (select-convert-from-cf-text):
* select.el (select-convert-from-cf-unicodetext):
Use #'position rather than #'string-match in these functions.
* setup-paths.el (paths-emacs-data-root-p):
Use #'search when looking for simple string.
* sound.el (load-sound-file):
Use #'split-string-by-char rather than an inline reimplementation
of same.
* startup.el (splash-screen-window-body):
* startup.el (splash-screen-tty-body):
Search for simple strings using #'search.
* version.el (emacs-version):
Ditto.
* x-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* x-font-menu.el (x-reset-device-font-menus-core):
Use #'split-string-by-char here.
* x-init.el (x-initialize-keyboard):
Search for a simple string using #'search.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 01 Apr 2015 14:28:20 +0100 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
;;; paths.el --- define pathnames for use by various Emacs commands. ;; Copyright (C) 1986, 1988, 1993, 1994, 1997 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software: you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation, either version 3 of the License, or (at your ;; option) any later version. ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;; for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: FSF 19.30. ;;; Commentary: ;; This file is dumped with XEmacs. ;; These are default settings for names of certain files and directories ;; that Emacs needs to refer to from time to time. ;; If these settings are not right, override them with `setq' ;; in site-start.el. Do not change this file. ;;; Code: ;Note: FSF's version is: ;(defvar Info-default-directory-list ; (let ((start (list "/usr/local/lib/info/" ; ;; This comes second so that, if it is the same ; ;; as configure-info-directory (which is usually true) ; ;; and Emacs has been installed (also usually true) ; ;; then the list will end with two copies of this; ; ;; which means that the last dir file Info-insert-dir ; ;; finds will be the one in this directory. ; "/usr/local/info/")) ; (configdir (file-name-as-directory configure-info-directory))) ; (setq start (nconc start (list configdir))) ; start) ; "List of directories to search for Info documentation files. ;They are searched in the order they are given in this list. ;Therefore, the directory of Info files that come with Emacs ;normally should come last (so that local files override standard ones).") ;Our commented-out version is: ;(defvar Info-default-directory-list ; (let ((start (list "/usr/local/info/" ; "/usr/local/lib/info/")) ; (configdir (file-name-as-directory configure-info-directory))) ; (or (member configdir start) ; (setq start (nconc start (list configdir)))) ; (or (member (expand-file-name "../info/" data-directory) start) ; (setq start ; (nconc start ; (list (expand-file-name "../info/" data-directory))))) ; start) ; "List of directories to search for Info documentation files.") (defvar news-path "/usr/spool/news/" "The root directory below which all news files are stored.") (defvar news-inews-program nil "Program to post news.") ;(defvar gnus-default-nntp-server "" ; ;; set this to your local server ; "The name of the host running an NNTP server. ;If it is a string such as \":DIRECTORY\", then ~/DIRECTORY ;is used as a news spool. `gnus-nntp-server' is initialized from NNTPSERVER ;environment variable or, if none, this value.") ;(defvar gnus-nntp-service "nntp" ; "NNTP service name, usually \"nntp\" or 119). ;Go to a local news spool if its value is nil, in which case `gnus-nntp-server' ;should be set to `(system-name)'.") (defvar mh-progs nil "Directory containing MH commands.") (defvar mh-lib nil "Directory of MH library.") (defvar rmail-file-name "~/RMAIL" "Name of user's primary mail file.") (defconst rmail-spool-directory nil "Name of directory used by system mailer for delivering new mail. Its name should end with a slash.") (defconst sendmail-program nil "Program used to send messages.") (defconst remote-shell-program nil "Program used to execute shell commands on a remote machine.") (defconst term-file-prefix "term/" "If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))) You may set this variable to nil in your `.emacs' file if you do not wish the terminal-initialization file to be loaded.") (defconst manual-program nil "Program to run to print man pages.") (defconst abbrev-file-name "~/.abbrev_defs" "*Default name of file to read abbrevs from.") (defconst directory-abbrev-alist nil) ;; Formerly, the values of these variables were computed once ;; (at dump time). However, with the advent of pre-compiled binaries ;; and homebrewed systems such as Linux where who knows where the ;; hell the various programs may be located (if they even exist at all), ;; it's clear that we need to recompute these values at run time. ;; In typical short-sightedness, site administrators have been told up ;; till now to do `setq's in site-init.el, which is run only once -- ;; at dump time. So we have to do contortions to make sure we don't ;; override values set in site-init.el. (defun initialize-xemacs-paths () "Initialize the XEmacs path variables from the environment. Called automatically at dump time and run time. Do not call this. Will not override settings in site-init.el or site-run.el." (let ((l #'(lambda (var value) (let ((origsym (intern (concat "paths-el-original-" (symbol-name var))))) (if (running-temacs-p) (progn (set var value) (set origsym value)) (and (eq (symbol-value var) (symbol-value origsym)) (set var value))))))) (funcall l 'news-inews-program (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews") ((file-exists-p "/usr/local/inews") "/usr/local/inews") ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews") ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews") (t "inews"))) (funcall l 'mh-progs (cond ((file-directory-p "/usr/bin/mh") "/usr/bin/mh/") ((file-directory-p "/usr/local/bin/mh") "/usr/local/bin/mh/") ((file-directory-p "/usr/local/mh") "/usr/local/mh/") (t "/usr/local/bin/"))) (funcall l 'mh-libs (cond ((file-directory-p "/usr/lib/mh") "/usr/lib/mh/") ((file-directory-p "/usr/local/lib/mh") "/usr/local/lib/mh/") (t "/usr/local/bin/mh/"))) (funcall l 'rmail-spool-directory (cond ;; SVR4 and recent BSD are said to use this. ;; Rather than trying to know precisely which systems use it, ;; let's assume this dir is never used for anything else. ((file-exists-p "/var/mail") "/var/mail/") ((memq system-type '(hpux usg-unix-v irix)) "/usr/mail/") ((memq system-type '(linux)) "/var/spool/mail/") (t "/usr/spool/mail/"))) (funcall l 'sendmail-program (cond ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail") ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") (t "fakemail"))) ;In ../etc, to interface to /bin/mail. (funcall l 'remote-shell-program (cond ;; Some systems use rsh for the remote shell; others use that ;; name for the restricted shell and use remsh for the remote ;; shell. Let's try to guess based on what we actually find ;; out there. The restricted shell is almost certainly in ;; /bin or /usr/bin, so it's probably safe to assume that an ;; rsh found elsewhere is the remote shell program. The ;; converse is not true: /usr/bin/rsh could be either one, so ;; check that last. ((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh") ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh") ((file-exists-p "/bin/remsh") "/bin/remsh") ((file-exists-p "/usr/bin/remsh") "/usr/bin/remsh") ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh") ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh") ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh") ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh") ((file-exists-p "/usr/bin/rcmd") "/usr/bin/rcmd") ((file-exists-p "/bin/rcmd") "/bin/rcmd") ((file-exists-p "/bin/rsh") "/bin/rsh") ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh") (t "rsh"))) (funcall l 'manual-program ;; Solaris 2 has both of these files; prefer /usr/ucb/man ;; because the other has nonstandard argument conventions. (if (file-exists-p "/usr/ucb/man") "/usr/ucb/man" "/usr/bin/man")) (funcall l 'directory-abbrev-alist ;; Try to match various conventions for automounter temporary ;; mount points. These temporary mount points may go away, so ;; it's important that we only try to read files under the ;; "advertised" mount point, rather than the temporary one, or it ;; will look like files have been deleted on us. Whoever came up ;; with this design is clearly a moron of the first order, but ;; now we're stuck with it, no doubt until the end of time. ;; ;; For best results, automounter junk should go near the front of this ;; list, and other user translations should come after it. ;; ;; Our code handles the following empirically observed conventions: ;; /net is an actual directory! (some systems are not broken!) ;; /net/HOST -> /tmp_mnt/net/HOST (`standard' old Sun automounter) ;; /net/HOST -> /tmp_mnt/HOST (BSDI 4.0) ;; /net/HOST -> /a/HOST (Freebsd 2.2.x) ;; /net/HOST -> /amd/HOST (seen in amd sample config files) ;; ;; If your system has a different convention, you may have to change this. ;; Don't forget to send in a patch! (when (file-directory-p "/net") (append (when (file-directory-p "/tmp_mnt") (if (file-directory-p "/tmp_mnt/net") '(("\\`/tmp_mnt/net/" . "/net/")) '(("\\`/tmp_mnt/" . "/net/")))) (when (file-directory-p "/a") '(("\\`/a/" . "/net/"))) (when (file-directory-p "/amd") '(("\\`/amd/" . "/net/"))) ))) )) (if (running-temacs-p) (initialize-xemacs-paths)) ;;; paths.el ends here