entered into RCS

5 files changed, 48 insertions, 43 deletions

diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 6a6956ad81d..84b9dfe6ffb 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -328,40 +328,40 @@ latitude, time zone, and date.
 
 This function is suitable for execution in a .emacs file."
  (interactive "p")
- (if (< arg 16)
-     (if (not (and calendar-latitude calendar-longitude calendar-time-zone))
-         (solar-setup)))
+ (if (and (< arg 16)
+          (not (and calendar-latitude calendar-longitude calendar-time-zone)))
+     (solar-setup))
  (let* ((calendar-longitude
-         (if (< arg 16)
-             calendar-longitude
+         (if (< arg 16) calendar-longitude
            (solar-get-number
             "Enter longitude (decimal fraction; + east, - west): ")))
         (calendar-latitude
-         (if (< arg 16)
-             calendar-latitude
+         (if (< arg 16) calendar-latitude
            (solar-get-number
             "Enter latitude (decimal fraction; + north, - south): ")))
         (calendar-time-zone
-         (if (< arg 16)
-             calendar-time-zone
+         (if (< arg 16) calendar-time-zone
            (solar-get-number
             "Enter difference from Universal Time (in minutes): ")))
         (calendar-location-name
-         (let ((float-output-format "%.1f"))
-           (format "%s%s, %s%s"
-                   (abs calendar-latitude)
-                   (if (> calendar-latitude 0) "N" "S")
-                   (abs calendar-longitude)
-                   (if (> calendar-longitude 0) "E" "W"))))
+         (if (< arg 16) calendar-location-name
+           (let ((float-output-format "%.1f"))
+             (format "%s%s, %s%s"
+                     (abs calendar-latitude)
+                     (if (> calendar-latitude 0) "N" "S")
+                     (abs calendar-longitude)
+                     (if (> calendar-longitude 0) "E" "W")))))
         (calendar-standard-time-zone-name
-         (cond ((= calendar-time-zone 0) "UT")
-               ((< calendar-time-zone 0) (format "UT%dmin" calendar-time-zone))
-               (t                   (format "UT+%dmin" calendar-time-zone))))
-        (calendar-daylight-savings-starts nil)
-        (calendar-daylight-savings-ends nil)
-        (date (if (< arg 4)
-                  (calendar-current-date)
-                (calendar-read-date)))
+         (if (< arg 16) calendar-standard-time-zone-name
+           (cond ((= calendar-time-zone 0) "UT")
+                 ((< calendar-time-zone 0)
+                     (format "UT%dmin" calendar-time-zone))
+                 (t  (format "UT+%dmin" calendar-time-zone)))))
+        (calendar-daylight-savings-starts
+         (if (< arg 16) calendar-daylight-savings-starts))
+        (calendar-daylight-savings-ends
+         (if (< arg 16) calendar-daylight-savings-ends))
+        (date (if (< arg 4) (calendar-current-date) (calendar-read-date)))
         (date-string (calendar-date-string date t))
         (time-string (solar-sunrise-sunset date))
         (msg (format "%s: %s" date-string time-string))
diff --git a/lisp/info.el b/lisp/info.el
index a044aa77796..bf6dec805ea 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -179,7 +179,7 @@ to read a file name from the minibuffer."
                             (insert-buffer-substring buf)
                             (set-marker Info-tag-table-marker
                                         (match-end 0))))
-                     (set-marker Info-tag-table-marker pos))))
+                      (set-marker Info-tag-table-marker pos))))
               (setq Info-current-file
                     (file-name-sans-versions buffer-file-name))))
         (if (equal nodename "*")
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 16178c018e2..5e6f9adbd5f 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -198,6 +198,7 @@ before `hide-ifdef-mode' modifies it.")
           (cons '(hide-ifdef-mode " Ifdef")
                 minor-mode-alist)))
 
+;;;###autoload
 (defun hide-ifdef-mode (arg)
   "Toggle Hide-Ifdef mode.  This is a minor mode, albeit a large one.
 With ARG, turn Hide-Ifdef mode on iff arg is positive.
@@ -845,6 +846,7 @@ to redo on a recursive entry."
 
 ;===%%SF%% exports (Start)  ===
 
+;;;###autoload
 (defvar hide-ifdef-initially nil
   "*Non-nil if `hide-ifdefs' should be called when Hide-Ifdef mode
 is first activated.")
@@ -852,12 +854,14 @@ is first activated.")
 (defvar hide-ifdef-hiding nil
   "Non-nil if text might be hidden.")
 
+;;;###autoload
 (defvar hide-ifdef-read-only nil
   "*Set to non-nil if you want buffer to be read-only while hiding text.")
 
 (defvar hif-outside-read-only nil
   "Internal variable.  Saves the value of `buffer-read-only' while hiding.")
 
+;;;###autoload
 (defvar hide-ifdef-lines nil
   "*Set to t if you don't want to see the #ifX, #else, and #endif lines.")
 
diff --git a/lisp/sort.el b/lisp/sort.el
index dd238d326e5..4405b6e77c0 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -29,9 +29,10 @@
 Arguments are REVERSE NEXTRECFUN ENDRECFUN &optional STARTKEYFUN ENDKEYFUN.
 
 We divide the accessible portion of the buffer into disjoint pieces
-called sort records.  A portion of each sort record (perhaps all of it)
-is designated as the sort key.  The records are rearranged in the buffer
-in order by their sort keys.  The records may or may not be contiguous.
+called sort records.  A portion of each sort record (perhaps all of
+it) is designated as the sort key.  The records are rearranged in the
+buffer in order by their sort keys.  The records may or may not be
+contiguous.
 
 Usually the records are rearranged in order of ascending sort key.
 If REVERSE is non-nil, they are rearranged in order of descending sort key.
@@ -78,19 +79,19 @@ same as ENDRECFUN."
                                     'buffer-substring-lessp)
                                    (t
                                     'string<)))
-                    (sort sort-lists
-                          (cond ((numberp (car (car sort-lists)))
-                                 (function
-                                  (lambda (a b)
-                                    (< (car a) (car b)))))
-                                ((consp (car (car sort-lists)))
-                                 (function
-                                  (lambda (a b)
-                                    (buffer-substring-lessp (car a) (car b)))))
-                                (t
-                                 (function
-                                  (lambda (a b)
-                                    (string< (car a) (car b)))))))))
+                  (sort sort-lists
+                        (cond ((numberp (car (car sort-lists)))
+                               (function
+                                (lambda (a b)
+                                  (< (car a) (car b)))))
+                              ((consp (car (car sort-lists)))
+                               (function
+                                (lambda (a b)
+                                  (buffer-substring-lessp (car a) (car b)))))
+                              (t
+                               (function
+                                (lambda (a b)
+                                  (string< (car a) (car b)))))))))
           (if reverse (setq sort-lists (nreverse sort-lists)))
           (if messages (message "Reordering buffer..."))
           (sort-reorder-buffer sort-lists old)))
diff --git a/lisp/timer.el b/lisp/timer.el
index 128d32c7d30..bbd0db72742 100644
--- a/lisp/timer.el
+++ b/lisp/timer.el
@@ -50,7 +50,7 @@ the call to the function."
          (continue-process timer-process)))
   ;; There should be a living, breathing timer process now
   (let ((token (concat (current-time-string) "-" (length timer-alist))))
-    (send-string timer-process (concat time "\001" token "\n"))
+    (send-string timer-process (concat time "@" token "\n"))
     (setq timer-alist (cons (list token repeat function args) timer-alist))))
 
 (defun timer-process-filter (proc str)
@@ -63,9 +63,9 @@ the call to the function."
       (cond
        (do (apply (nth 2 do) (nth 3 do))   ; do it
            (if (natnump (nth 1 do))        ; reschedule it
-               (send-string proc (concat (nth 1 do) " sec\001" (car do) "\n"))
+               (send-string proc (concat (nth 1 do) " sec@" (car do) "\n"))
              (setq timer-alist (delq do timer-alist))))
-       ((string-match "timer: \\([^:]+\\): \\([^\001]*\\)\001\\(.*\\)$" token)
+       ((string-match "timer: \\([^:]+\\): \\([^@]*\\)@\\(.*\\)$" token)
         (setq error (substring token (match-beginning 1) (match-end 1))
               do    (substring token (match-beginning 2) (match-end 2))
               token (assoc (substring token (match-beginning 3) (match-end 3))