Some fixes to follow coding conventions in files maintained by FSF.

[bpt/emacs.git] / lisp / mail / blessmail.el

diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 5897455..0721369 100644 (file)
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -1,6 +1,6 @@
-;;; blessmail.el --- Decide whether movemail needs special privileges.
+;;; blessmail.el --- decide whether movemail needs special privileges
 
-;;; Copyright (C) 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1994 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -18,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -32,9 +33,11 @@
 
 ;;; Code:
 
-(message "Using load-path %s" load-path)
-(load "paths.el")
-(load "site-init" t)
+;; These are no longer needed because we run this in emacs instead of temacs.
+;; (message "Using load-path %s" load-path)
+;; (load "paths.el")
+;; It is not safe to load site-init.el here, because it might have things in it
+;; that won't load properly unless all the rest of Emacs is loaded.
 
 (let ((dirname (directory-file-name rmail-spool-directory))
       linkname attr modes)
@@ -43,23 +46,23 @@
     (setq dirname (if (file-name-absolute-p linkname)
                      linkname
                    (concat (file-name-directory dirname) linkname))))
-  (setq attr (file-attributes dirname))
-  (or (eq t (car attr))
-      (signal 'error
-             (list (format "%s is not a directory" rmail-spool-directory))))
-  (setq modes (nth 8 attr))
   (insert "#!/bin/sh\n")
-  (cond
-   ((= ?w (aref modes 8))
-    (insert "exit 0"))
-   ((= ?w (aref modes 5))
-    (insert "chgrp " (number-to-string (nth 3 attr))
-           " $* && chmod g+s $*\n"))
-   ((= ?w (aref modes 2))
-    (insert "chown " (number-to-string (nth 2 attr))
-           " $* && chmod u+s $*\n"))
-   (t
-    (insert "chown root $* && chmod u+s $*\n"))))
+  (setq attr (file-attributes dirname))
+  (if (not (eq t (car attr)))
+      (insert (format "echo %s is not a directory\n" rmail-spool-directory))
+    (setq modes (nth 8 attr))
+    (cond ((= ?w (aref modes 8))
+          ;; Nothing needs to be done.
+          )
+         ((= ?w (aref modes 5))
+          (insert "chgrp " (number-to-string (nth 3 attr))
+                  " $* && chmod g+s $*\n"))
+         ((= ?w (aref modes 2))
+          (insert "chown " (number-to-string (nth 2 attr))
+                  " $* && chmod u+s $*\n"))
+         (t
+          (insert "chown root $* && chmod u+s $*\n"))))
+  (insert "echo mail directory = " dirname "\n"))
 (write-region (point-min) (point-max) "blessmail")
 (kill-emacs)