Whitespace cleanup in etc

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 6926eb0..772d433 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -56,7 +56,7 @@ dist_etc_DATA = BETA CHARSETS CODING-STANDARDS CODINGS                        \
        TUTORIAL.ko TUTORIAL.no TUTORIAL.pl TUTORIAL.ro TUTORIAL.ru     \
        TUTORIAL.se TUTORIAL.th                                         \
        XKeysymDB codenames emacskeys.sco emacsstrs.sco gnuserv.README  \
-       package-index.LATEST.gpg refcard.tex rgb.txt            \
+       package-index.LATEST.gpg refcard.tex rgb.txt            \
        sample.Xdefaults sample.init.el
 
 dist_desktop_DATA = sxemacs.desktop

diff --git a/etc/custom/example-themes/europe-theme.el b/etc/custom/example-themes/europe-theme.el
index 28ec23c..88a593d 100644 (file)
--- a/etc/custom/example-themes/europe-theme.el
+++ b/etc/custom/example-themes/europe-theme.el
@@ -1,4 +1,4 @@
-;;;autoload 
+;;;autoload
 (deftheme europe
   "Settings for European users."
   :set-variable-settings

diff --git a/etc/custom/example-themes/example-theme.el b/etc/custom/example-themes/example-theme.el
index d35221b..33855be 100644 (file)
--- a/etc/custom/example-themes/example-theme.el
+++ b/etc/custom/example-themes/example-theme.el
@@ -1,4 +1,4 @@
-;;;autoload 
+;;;autoload
 (deftheme example
   "A sample theme for customize theme support."
   :variable-set-string "This variable has been made an example.")
@@ -10,6 +10,3 @@
  '(iswitchb-prompt-newbuffer nil))
 
 (provide-theme 'example)
-
-
-  
\ No newline at end of file

diff --git a/etc/editclient.sh b/etc/editclient.sh
index 99152dd..9e547eb 100755 (executable)
--- a/etc/editclient.sh
+++ b/etc/editclient.sh
@@ -9,4 +9,3 @@ else
   done
   exec gnuclient ${1+"$@"}
 fi
-

diff --git a/etc/sample.init.el b/etc/sample.init.el
index 49f76ab..2353cf3 100644 (file)
--- a/etc/sample.init.el
+++ b/etc/sample.init.el
@@ -287,7 +287,7 @@ Returns t if the feature was successfully required."
 ;; | `ignore-errors' is a compiled Lisp macro
 ;; |   -- loaded from "cl-macs"
 ;; | (ignore-errors &rest BODY)
-;; | 
+;; |
 ;; | Documentation:
 ;; | Execute FORMS; if an error occurs, return nil.
 ;; | Otherwise, return result of last FORM.
@@ -434,7 +434,7 @@ Returns t if the feature was successfully required."
 ;;   (Ultimate reductionism -- no brackets, no parens.  This is the form, in
 ;;    that, that the 'f1, 'f2, etc. took, which where in fact "long"
 ;;    forms.)
-;; 
+;;
 ;; '(control C)
 ;;
 ;;   (You cannot use '(control shift c) here.  This applies whenever Shift +
@@ -509,7 +509,7 @@ forward, and defaults to 1.  Buffers whose name begins with a space
 Omits normally invisible buffers (those whose name begins with a space)."
   (not (null (string-match "\\` " (buffer-name buf)))))
 
-(defvar Init-buffers-tab-grouping-regexp 
+(defvar Init-buffers-tab-grouping-regexp
   '("^\\(gnus-\\|message-mode\\|mime/viewer-mode\\)"
     "^\\(emacs-lisp-\\|lisp-\\)")
 ;; If non-nil, a list of regular expressions for buffer grouping.
@@ -530,7 +530,7 @@ Omits normally invisible buffers (those whose name begins with a space)."
   (if (boundp 'buffers-tab-selection-function)
       (funcall buffers-tab-selection-function buffer-to-select buf1)
     (let ((mode1 (symbol-name (symbol-value-in-buffer 'major-mode buf1)))
-         (mode2 (symbol-name (symbol-value-in-buffer 'major-mode 
+         (mode2 (symbol-name (symbol-value-in-buffer 'major-mode
                                                      buffer-to-select)))
          (modenm1 (symbol-value-in-buffer 'mode-name buf1))
          (modenm2 (symbol-value-in-buffer 'mode-name buffer-to-select)))
@@ -538,7 +538,7 @@ Omits normally invisible buffers (those whose name begins with a space)."
                 (eq modenm1 modenm2)
                 (and (string-match "^[^-]+-" mode1)
                      (string-match
-                      (concat "^" (regexp-quote 
+                      (concat "^" (regexp-quote
                                    (substring mode1 0 (match-end 0))))
                       mode2))
                 (and Init-buffers-tab-grouping-regexp
@@ -637,19 +637,19 @@ backward, and defaults to 1.  Buffers whose name begins with a space
 ;; (when (console-on-window-system-p)
 ;;     (global-set-key "\C-x\C-c"
 ;;       #'(lambda () (interactive)
-;;       (beep)
-;;       (message "Use the \"File/Exit XEmacs\" menu item to exit XEmacs"))))
+;;       (beep)
+;;       (message "Use the \"File/Exit XEmacs\" menu item to exit XEmacs"))))
 
 ;; ;; Make C-k always delete the whole line, which is what most people want,
 ;; ;; anyway.
 ;; (setq kill-whole-line 'always)
 ;; ;; M-k does the old behavior (kill to end of line).
 ;; (global-set-key '(meta k) #'(lambda ()
-;;                           (interactive)
-;;                           (if (fboundp 'historical-kill-line)
-;;                               (call-interactively #'historical-kill-line)
-;;                             (let ((kill-whole-line nil))
-;;                               (call-interactively #'kill-line)))))
+;;                           (interactive)
+;;                           (if (fboundp 'historical-kill-line)
+;;                               (call-interactively #'historical-kill-line)
+;;                             (let ((kill-whole-line nil))
+;;                               (call-interactively #'kill-line)))))
 ;; ;; and Meta-Shift-K does what used to be on M-k, and should
 ;; ;; (hopefully) even work under TTY's.
 ;; (global-set-key '(meta K) 'kill-sentence)
@@ -658,7 +658,7 @@ backward, and defaults to 1.  Buffers whose name begins with a space
 ;; ;; on recent XEmacs versions.
 ;; (cond ((boundp 'shifted-motion-keys-select-region)
 ;;        (setq shifted-motion-keys-select-region t))
-;;       ;; otherwise, try the pc-select package -- 
+;;       ;; otherwise, try the pc-select package --
 ;;       ((Init-safe-require 'pc-select)
 ;;        (pc-select-mode 1)))
 
@@ -742,14 +742,14 @@ This checks in turn:
 (defun toggle-profiling ()
   "Start profiling, or stop it and print results.
 This lets you figure out where time is being spent when executing Lisp code."
-  (interactive)  
-  (if (profiling-active-p) 
-      (progn  
-       (stop-profiling) 
+  (interactive)
+  (if (profiling-active-p)
+      (progn
+       (stop-profiling)
        (message "...Finished profiling")
        (profile-results))
-    (message "Profiling...") 
-    (clear-profiling-info) 
+    (message "Profiling...")
+    (clear-profiling-info)
     (start-profiling)))
 
 ;; Note that sequences of C-c plus a letter are specifically
@@ -1003,13 +1003,13 @@ previous with \\[backward-sexp]."
 ;;
 ;; ...which is probably a whee bit loooooong. --SY.
 ;; (if (or (equal frame-title-format "%S: %b")
-;;     (equal frame-title-format "%b - XEmacs"))
+;;     (equal frame-title-format "%b - XEmacs"))
 ;;     (setq frame-title-format
-;;       (concat "%b - XEmacs "
-;;               (progn (string-match "\\(.*?\\)\\( XEmacs Lucid\\)?$"
-;;                                    emacs-version)
-;;                      (match-string 1 emacs-version))
-;;               " [" invocation-directory invocation-name "]")))
+;;       (concat "%b - XEmacs "
+;;               (progn (string-match "\\(.*?\\)\\( XEmacs Lucid\\)?$"
+;;                                    emacs-version)
+;;                      (match-string 1 emacs-version))
+;;               " [" invocation-directory invocation-name "]")))
 ;;
 ;; To get a similar thing in SXEmacs, try...
 (setq frame-title-format
@@ -1107,24 +1107,24 @@ previous with \\[backward-sexp]."
 ;  ((and running-sxemacs
 ;        (console-on-window-system-p))
 ;   (let* ((root-p (eq 0 (user-uid)))
-;       (dpy (or (getenv "DISPLAY") ""))
-;       (remote-p (not
-;                  (or (string-match "^\\(\\|unix\\|localhost\\):" dpy)
-;                      (let ((s (system-name)))
-;                        (if (string-match "\\.\\(netscape\\|mcom\\)\\.com" s)
-;                            (setq s (substring s 0 (match-beginning 0))))
-;                        (string-match (concat "^" (regexp-quote s)) dpy)))))
-;       (bg (cond (root-p "coral2")
-;                 (remote-p "palegreen1")
-;                 (t nil))))
+;       (dpy (or (getenv "DISPLAY") ""))
+;       (remote-p (not
+;                  (or (string-match "^\\(\\|unix\\|localhost\\):" dpy)
+;                      (let ((s (system-name)))
+;                        (if (string-match "\\.\\(netscape\\|mcom\\)\\.com" s)
+;                            (setq s (substring s 0 (match-beginning 0))))
+;                        (string-match (concat "^" (regexp-quote s)) dpy)))))
+;       (bg (cond (root-p "coral2")
+;                 (remote-p "palegreen1")
+;                 (t nil))))
 ;     (cond (bg
-;         (let ((def (color-name (face-background 'default)))
-;               (faces (face-list)))
-;           (while faces
-;             (let ((obg (face-background (car faces))))
-;               (if (and obg (equal def (color-name obg)))
-;                   (set-face-background (car faces) bg)))
-;             (setq faces (cdr faces)))))))))
+;         (let ((def (color-name (face-background 'default)))
+;               (faces (face-list)))
+;           (while faces
+;             (let ((obg (face-background (car faces))))
+;               (if (and obg (equal def (color-name obg)))
+;                   (set-face-background (car faces) bg)))
+;             (setq faces (cdr faces)))))))))
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1293,12 +1293,12 @@ Key-bindings:
 ;;; Load crypt, which is a package for automatically decoding and reencoding
 ;;; files by various methods - for example, you can visit a .Z or .gz file,
 ;;; edit it, and have it automatically re-compressed when you save it again.
-;;; 
+;;;
 ; (setq crypt-encryption-type 'pgp   ; default encryption mechanism
 ;       crypt-confirm-password t          ; make sure new passwords are correct
 ;       ;crypt-never-ever-decrypt t  ; if you don't encrypt anything, set this to
-;                                 ; tell it not to assume that "binary" files
-;                                 ; are encrypted and require a password.
+;                                 ; tell it not to assume that "binary" files
+;                                 ; are encrypted and require a password.
 ;       )
 ; (Init-safe-require 'crypt)
 
@@ -1466,8 +1466,8 @@ Key-bindings:
 
 ;;; ********************
 ;;; W3 is a browser for the World Wide Web, and takes advantage of the very
-;;; latest redisplay features in XEmacs.  You can access it simply by typing 
-;;; 'M-x w3'; however, if you're unlucky enough to be on a machine that is 
+;;; latest redisplay features in XEmacs.  You can access it simply by typing
+;;; 'M-x w3'; however, if you're unlucky enough to be on a machine that is
 ;;; behind a firewall, you will have to do something like this first:
 
 ;(setq w3-use-telnet t
@@ -1487,4 +1487,3 @@ Key-bindings:
 ;; and thus the named file is unreadable.
 (when Init-inhibit-custom-file-p
   (setq custom-file (make-temp-name "/tmp/non-existent-")))
-

diff --git a/etc/tests/external-widget/Makefile b/etc/tests/external-widget/Makefile
index 8e6c0e0..c64f3b5 100644 (file)
--- a/etc/tests/external-widget/Makefile
+++ b/etc/tests/external-widget/Makefile
@@ -17,8 +17,8 @@ LDFLAGS += -R$(OPENWINHOME)/lib:$(EMACSLIBDIR) -g
 
 TM_OBJS = test-ew-motif.o
 TXL_OBJS = test-ew-xlib.o
-MOTIF_LIBS = -Bstatic -lextcli_Xm -Bdynamic -lXm -lXt -ltt -lX11 -lgen -lm 
-XLIB_LIBS = -Bstatic -lextcli_Xlib -Bdynamic -ltt -lX11 -lgen -lm 
+MOTIF_LIBS = -Bstatic -lextcli_Xm -Bdynamic -lXm -lXt -ltt -lX11 -lgen -lm
+XLIB_LIBS = -Bstatic -lextcli_Xlib -Bdynamic -ltt -lX11 -lgen -lm
 
 all: test-ew-motif
 
@@ -27,4 +27,3 @@ test-ew-motif: $(TM_OBJS)
 
 test-ew-xlib: $(TXL_OBJS)
        $(CC) -o $@ $(LDFLAGS) $(TXL_OBJS) $(XLIB_LIBS)
-

diff --git a/etc/tests/external-widget/test-ew-motif.c b/etc/tests/external-widget/test-ew-motif.c
index 4333c73..34be556 100644 (file)
--- a/etc/tests/external-widget/test-ew-motif.c
+++ b/etc/tests/external-widget/test-ew-motif.c
@@ -95,7 +95,7 @@ main(int argc, char **argv)
 
                strcpy(labarr, "window:");
                for (i = 0; i < no_ews; i++) {
-                       int sz = snprintf(tmpbuf, sizeof(tmpbuf), 
+                       int sz = snprintf(tmpbuf, sizeof(tmpbuf),
                                          " %d", XtWindow(emacscli[i]));
                        assert(sz>=0 && sz<sizeof(tmpbuf));
                        strcat(labarr, tmpbuf);

diff --git a/etc/tests/external-widget/test-ew-xlib.c b/etc/tests/external-widget/test-ew-xlib.c
index 84e8f4d..e0f4240 100644 (file)
--- a/etc/tests/external-widget/test-ew-xlib.c
+++ b/etc/tests/external-widget/test-ew-xlib.c
@@ -13,8 +13,8 @@
 #define TOO_SMALL 0
 #define BIG_ENOUGH 1
 
-/* These are used as arguments to nearly every Xlib routine, so it saves 
- * routine arguments to declare them global.  If there were 
+/* These are used as arguments to nearly every Xlib routine, so it saves
+ * routine arguments to declare them global.  If there were
  * additional source files, they would be declared extern there. */
 Display *display;
 int screen_num;
@@ -55,7 +55,7 @@ char **argv;
        display_height = DisplayHeight(display, screen_num);
 
        /* Note that in a real application, x and y would default to 0
-        * but would be settable from the command line or resource database.  
+        * but would be settable from the command line or resource database.
         */
        x = y = 0;
 
@@ -88,12 +88,12 @@ char **argv;
                XWMHints wm_hints;
                XClassHint class_hints;
 
-               /* format of the window name and icon name 
+               /* format of the window name and icon name
                 * arguments has changed in R4 */
                XTextProperty windowName, iconName;
 
                /* These calls store window_name and icon_name into
-                * XTextProperty structures and set their other 
+                * XTextProperty structures and set their other
                 * fields properly. */
                if (XStringListToTextProperty(&window_name, 1, &windowName) ==
                    0) {
@@ -232,7 +232,7 @@ XFontStruct *font_info;
        /* specify font */
        XSetFont(display, *gc, font_info->fid);
 
-       /* specify black foreground since default window background is 
+       /* specify black foreground since default window background is
         * white and default foreground is undefined. */
        XSetForeground(display, *gc, BlackPixel(display, screen_num));
 
@@ -314,7 +314,7 @@ draw_text(Window win, GC gc, XFontStruct *font_info, unsigned int win_width, uns
         * of the window.  Since the baseline of the string is what we
         * need to locate for XDrawString, and the baseline is one
         * font_info->ascent below the top of the character,
-        * the final offset of the origin up from the center of the 
+        * the final offset of the origin up from the center of the
         * window is one font_height + one descent. */
 
        initial_y_offset = win_height / 2 - font_height - font_info->descent;