* cedet/ede/makefile-edit.el (makefile-beginning-of-command)

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index 15705fc8cae6b48646da3e3d7c2c4ec7a8dec37f..401a981cd8785405eecb5e801fcf79a580916eb0 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,7 +1,7 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -32,11 +32,12 @@
 ;;; Code:
 
 ;; Docstrings in this file should, where reasonable, follow the
-;; conventions described in bindings.el, so that they get put in the
+;; conventions described in make-docfile, so that they get put in the
 ;; DOC file rather than in memory.
 
 (defun prune-directory-list (dirs &optional keep reject)
-  "Returns a copy of DIRS with all non-existent directories removed.
+  "\
+Return a copy of DIRS with all non-existent directories removed.
 The optional argument KEEP is a list of directories to retain even if
 they don't exist, and REJECT is a list of directories to remove from
 DIRS, even if they exist; REJECT takes precedence over KEEP.
@@ -121,8 +122,8 @@ the environment variable INFOPATH is set.")
 The name of the host running an NNTP server.
 The null string means use the local host as the server site.")
 
-(defvar gnus-nntp-service "nntp"
-  "NNTP service name, usually \"nntp\" or 119).
+(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)'.")
 
@@ -130,8 +131,8 @@ should be set to `(system-name)'.")
 *The name of your organization, as a string.
 The `ORGANIZATION' environment variable is used instead if defined.")
 
-(defcustom rmail-file-name "~/RMAIL"
-  "*Name of user's primary mail file."
+(defcustom rmail-file-name "~/RMAIL" "\
+Name of user's primary mail file."
   :type 'string
   :group 'rmail
   :version "21.1")
@@ -176,16 +177,10 @@ Its name should end with a slash.")
   :group 'environment
   :type 'file)
 
-(defvar term-file-prefix (if (eq system-type 'vax-vms) "[.term]" "term/") "\
+(defvar 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.")
 
-(defvar abbrev-file-name
-  (if (eq system-type 'vax-vms)
-      "~/abbrev.def"
-    (convert-standard-filename "~/.abbrev_defs"))
-  "*Default name of file to read abbrevs from.")
-
 ;; arch-tag: bae27ffb-9944-4c87-b569-30d4635a99e1
 ;;; paths.el ends here