From ad961a0083a03fb36c92451b1d97ad12a4f2026f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 2 Dec 2010 19:06:11 -0800 Subject: [PATCH] startup.el trivia. * lisp/startup.el (normal-top-level-add-subdirs-to-load-path): Simplify. (normal-top-level-add-to-load-path, tty-handle-args): Convert comments to basic doc-strings. --- lisp/ChangeLog | 4 ++++ lisp/startup.el | 39 ++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 05b78537cb5..fb1246f9fdd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-12-03 Glenn Morris + * startup.el (normal-top-level-add-subdirs-to-load-path): Simplify. + (normal-top-level-add-to-load-path, tty-handle-args): + Convert comments to basic doc-strings. + * net/browse-url.el (browse-url-url-at-point) (browse-url-default-browser): Remove autoload cookies. diff --git a/lisp/startup.el b/lisp/startup.el index f9a9cbdd6fc..e85abe68f4c 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -411,34 +411,31 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." (default-directory this-dir) (canonicalized (if (fboundp 'untranslated-canonical-name) (untranslated-canonical-name this-dir)))) - ;; The Windows version doesn't report meaningful inode - ;; numbers, so use the canonicalized absolute file name of the - ;; directory instead. + ;; The Windows version doesn't report meaningful inode numbers, so + ;; use the canonicalized absolute file name of the directory instead. (setq attrs (or canonicalized (nthcdr 10 (file-attributes this-dir)))) (unless (member attrs normal-top-level-add-subdirs-inode-list) (push attrs normal-top-level-add-subdirs-inode-list) (dolist (file contents) - ;; The lower-case variants of RCS and CVS are for DOS/Windows. - (unless (member file '("." ".." "RCS" "CVS" "rcs" "cvs")) - (when (and (string-match "\\`[[:alnum:]]" file) - ;; Avoid doing a `stat' when it isn't necessary - ;; because that can cause trouble when an NFS server - ;; is down. - (not (string-match "\\.elc?\\'" file)) - (file-directory-p file)) - (let ((expanded (expand-file-name file))) - (unless (file-exists-p (expand-file-name ".nosearch" - expanded)) - (setq pending (nconc pending (list expanded))))))))))) + (and (string-match "\\`[[:alnum:]]" file) + ;; The lower-case variants of RCS and CVS are for DOS/Windows. + (not (member file '("RCS" "CVS" "rcs" "cvs"))) + ;; Avoid doing a `stat' when it isn't necessary because + ;; that can cause trouble when an NFS server is down. + (not (string-match "\\.elc?\\'" file)) + (file-directory-p file) + (let ((expanded (expand-file-name file))) + (or (file-exists-p (expand-file-name ".nosearch" expanded)) + (setq pending (nconc pending (list expanded)))))))))) (normal-top-level-add-to-load-path (cdr (nreverse dirs))))) -;; This function is called from a subdirs.el file. -;; It assumes that default-directory is the directory -;; in which the subdirs.el file exists, -;; and it adds to load-path the subdirs of that directory -;; as specified in DIRS. Normally the elements of DIRS are relative. (defun normal-top-level-add-to-load-path (dirs) + "This function is called from a subdirs.el file. +It assumes that `default-directory' is the directory in which the +subdirs.el file exists, and it adds to `load-path' the subdirs of +that directory as specified in DIRS. Normally the elements of +DIRS are relative." (let ((tail load-path) (thisdir (directory-file-name default-directory))) (while (and tail @@ -615,8 +612,8 @@ function to this list. The function should take no arguments, and initialize the window system environment to prepare for opening the first frame (e.g. open a connection to an X server).") -;; Handle the X-like command-line arguments "-fg", "-bg", "-name", etc. (defun tty-handle-args (args) + "Handle the X-like command-line arguments \"-fg\", \"-bg\", \"-name\", etc." (let (rest) (message "%S" args) (while (and args -- 2.11.4.GIT