Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103046. ------------------------------------------------------------ revno: 103046 committer: Jim Meyering branch nick: trunk timestamp: Mon 2011-01-31 08:34:45 +0100 message: charset.c (load_charset_map): Don't deref NULL on failed malloc. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-30 23:34:18 +0000 +++ src/ChangeLog 2011-01-31 07:34:45 +0000 @@ -1,3 +1,8 @@ +2011-01-31 Jim Meyering + + * charset.c (load_charset_map): Don't deref NULL on failed malloc. + Use xmalloc rather than malloc. + 2011-01-30 Paul Eggert strftime: import from gnulib === modified file 'src/charset.c' --- src/charset.c 2011-01-25 04:08:28 +0000 +++ src/charset.c 2011-01-31 07:34:45 +0000 @@ -292,7 +292,7 @@ else { if (! temp_charset_work) - temp_charset_work = malloc (sizeof (*temp_charset_work)); + temp_charset_work = xmalloc (sizeof (*temp_charset_work)); if (control_flag == 1) { memset (temp_charset_work->table.decoder, -1, ------------------------------------------------------------ revno: 103045 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-01-31 07:27:07 +0000 message: gnus-art.el (article-transform-date): Rewrite to still work when there are several rfc2822 parts. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-31 04:41:38 +0000 +++ lisp/gnus/ChangeLog 2011-01-31 07:27:07 +0000 @@ -1,5 +1,8 @@ 2011-01-31 Lars Ingebrigtsen + * gnus-art.el (article-transform-date): Rewrite to still work when + there are several rfc2822 parts. + * nnimap.el (nnimap-wait-for-response): Wait for results in a more secure manner. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-01-31 04:41:38 +0000 +++ lisp/gnus/gnus-art.el 2011-01-31 07:27:07 +0000 @@ -3420,62 +3420,50 @@ pos date bface eface) (save-excursion (save-restriction - (widen) - (goto-char (point-min)) - (while (or (setq date (get-text-property (setq pos (point)) - 'original-date)) - (when (setq pos (next-single-property-change - (point) 'original-date)) - (setq date (get-text-property pos 'original-date)) - t)) - (narrow-to-region - pos (if (setq pos (text-property-any pos (point-max) - 'original-date nil)) - (progn - (goto-char pos) - (if (or (bolp) (eobp)) - (point) - (1+ (point)))) - (point-max))) - (goto-char (point-min)) - (when (re-search-forward "^Date:" nil t) - (setq bface (get-text-property (point-at-bol) 'face) - eface (get-text-property (1- (point-at-eol)) 'face))) - (goto-char (point-min)) - ;; Delete any old Date headers. - (if date-position - (progn - (goto-char date-position) - (delete-region (point) - (progn - (gnus-article-forward-header) - (point)))) - (while (re-search-forward "^Date:" nil t) - (delete-region (point-at-bol) (progn - (gnus-article-forward-header) - (point))))) - (dolist (this-type (cond - ((null type) - (list 'ut)) - ((atom type) - (list type)) - (t - type))) - (insert (article-make-date-line date (or this-type 'ut)) "\n") - (forward-line -1) - (put-text-property (line-beginning-position) - (1+ (line-beginning-position)) - 'gnus-date-type this-type) - ;; Do highlighting. - (beginning-of-line) - (when (looking-at "\\([^:]+\\): *\\(.*\\)$") - (put-text-property (match-beginning 1) (1+ (match-end 1)) - 'face bface) - (put-text-property (match-beginning 2) (match-end 2) - 'face eface))) - (put-text-property (point-min) (1- (point-max)) 'original-date date) - (goto-char (point-max)) - (widen)))))) + (goto-char (point-min)) + (when (re-search-forward "^Date:" nil t) + (setq bface (get-text-property (point-at-bol) 'face) + eface (get-text-property (1- (point-at-eol)) 'face))) + (goto-char (point-min)) + ;; Delete any old Date headers. + (if date-position + (progn + (goto-char date-position) + (setq date (get-text-property (point) 'original-date)) + (delete-region (point) + (progn + (gnus-article-forward-header) + (point))) + (article-transform-date date type bface eface)) + (while (re-search-forward "^Date:" nil t) + (setq date (get-text-property (match-beginning 0) 'original-date)) + (delete-region (point-at-bol) (progn + (gnus-article-forward-header) + (point))) + (article-transform-date date type bface eface) + (forward-line 1))))))) + +(defun article-transform-date (date type bface eface) + (dolist (this-type (cond + ((null type) + (list 'ut)) + ((atom type) + (list type)) + (t + type))) + (insert (article-make-date-line date (or this-type 'ut)) "\n") + (forward-line -1) + (beginning-of-line) + (put-text-property (point) (1+ (point)) + 'original-date date) + (put-text-property (point) (1+ (point)) + 'gnus-date-type this-type) + ;; Do highlighting. + (when (looking-at "\\([^:]+\\): *\\(.*\\)$") + (put-text-property (match-beginning 1) (1+ (match-end 1)) + 'face bface) + (put-text-property (match-beginning 2) (match-end 2) + 'face eface)))) (defun article-make-date-line (date type) "Return a DATE line of TYPE." ------------------------------------------------------------ revno: 103044 committer: Jan D branch nick: trunk timestamp: Mon 2011-01-31 07:44:05 +0100 message: Use xmalloc instead of malloc. * lwlib-Xm.c (make_destroyed_instance): * lwlib-utils.c (XtApplyToWidgets): * lwlib.c (safe_strdup, malloc_widget_value) (allocate_widget_info, allocate_widget_instance): Use xmalloc instead of malloc. diff: === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2011-01-25 04:08:28 +0000 +++ lwlib/ChangeLog 2011-01-31 06:44:05 +0000 @@ -1,3 +1,11 @@ +2011-01-31 Jan Djärv + + * lwlib-Xm.c (make_destroyed_instance): + * lwlib-utils.c (XtApplyToWidgets): + * lwlib.c (safe_strdup, malloc_widget_value) + (allocate_widget_info, allocate_widget_instance): Use xmalloc + instead of malloc. + 2011-01-25 Werner Meisner * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference === modified file 'lwlib/lwlib-Xm.c' --- lwlib/lwlib-Xm.c 2011-01-26 08:36:39 +0000 +++ lwlib/lwlib-Xm.c 2011-01-31 06:44:05 +0000 @@ -173,7 +173,7 @@ Boolean pop_up_p) { destroyed_instance* instance = - (destroyed_instance*)malloc (sizeof (destroyed_instance)); + (destroyed_instance*) xmalloc (sizeof (destroyed_instance)); instance->name = safe_strdup (name); instance->type = safe_strdup (type); instance->widget = widget; === modified file 'lwlib/lwlib-utils.c' --- lwlib/lwlib-utils.c 2011-01-25 04:08:28 +0000 +++ lwlib/lwlib-utils.c 2011-01-31 06:44:05 +0000 @@ -74,7 +74,7 @@ the procedure might add/delete elements, which would lose badly. */ int nkids = cw->composite.num_children; - Widget *kids = (Widget *) malloc (sizeof (Widget) * nkids); + Widget *kids = (Widget *) xmalloc (sizeof (Widget) * nkids); int i; memcpy ((char *) kids, (char *) cw->composite.children, sizeof (Widget) * nkids); === modified file 'lwlib/lwlib.c' --- lwlib/lwlib.c 2011-01-25 04:08:28 +0000 +++ lwlib/lwlib.c 2011-01-31 06:44:05 +0000 @@ -109,9 +109,7 @@ { char *result; if (! s) return 0; - result = (char *) malloc (strlen (s) + 1); - if (! result) - return 0; + result = (char *) xmalloc (strlen (s) + 1); strcpy (result, s); return result; } @@ -157,7 +155,7 @@ } else { - wv = (widget_value *) malloc (sizeof (widget_value)); + wv = (widget_value *) xmalloc (sizeof (widget_value)); malloc_cpt++; } memset ((void*) wv, 0, sizeof (widget_value)); @@ -257,7 +255,7 @@ lw_callback post_activate_cb, lw_callback highlight_cb) { - widget_info* info = (widget_info*)malloc (sizeof (widget_info)); + widget_info* info = (widget_info*) xmalloc (sizeof (widget_info)); info->type = safe_strdup (type); info->name = safe_strdup (name); info->id = id; @@ -299,7 +297,7 @@ allocate_widget_instance (widget_info* info, Widget parent, Boolean pop_up_p) { widget_instance* instance = - (widget_instance*)malloc (sizeof (widget_instance)); + (widget_instance*) xmalloc (sizeof (widget_instance)); memset (instance, 0, sizeof *instance); instance->parent = parent; instance->pop_up_p = pop_up_p; ------------------------------------------------------------ revno: 103043 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-01-31 04:41:38 +0000 message: nnimap.el (nnimap-wait-for-response): Wait for results in a more secure manner. gnus-art.el (article-update-date-lapsed): Try to avoid having point move around by not using save-window-excursion. It seems to work... diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-31 03:35:09 +0000 +++ lisp/gnus/ChangeLog 2011-01-31 04:41:38 +0000 @@ -1,3 +1,11 @@ +2011-01-31 Lars Ingebrigtsen + + * nnimap.el (nnimap-wait-for-response): Wait for results in a more + secure manner. + + * gnus-art.el (article-update-date-lapsed): Try to avoid having point + move around by not using save-window-excursion. It seems to work... + 2011-01-31 Katsumi Yamaoka * gnus-art.el (article-make-date-line): Work for user-defined format. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-01-31 02:55:13 +0000 +++ lisp/gnus/gnus-art.el 2011-01-31 04:41:38 +0000 @@ -3646,31 +3646,31 @@ (defun article-update-date-lapsed () "Function to be run from a timer to update the lapsed time line." (save-match-data - (let (deactivate-mark) - (save-window-excursion - (ignore-errors - (walk-windows - (lambda (w) - (set-buffer (window-buffer w)) - (when (eq major-mode 'gnus-article-mode) - (let ((old-line (count-lines (point-min) (point))) - (old-column (current-column))) - (goto-char (point-min)) - (while (re-search-forward "^Date:" nil t) - (let ((type (get-text-property (match-beginning 0) 'gnus-date-type))) - (when (memq type '(lapsed combined-lapsed user-format)) - (save-excursion - (article-date-ut type t (match-beginning 0))) - (forward-line 1)))) - (goto-char (point-min)) - (when (> old-column 0) - (setq old-line (1- old-line))) - (forward-line old-line) - (end-of-line) - (when (> (current-column) old-column) - (beginning-of-line) - (forward-char old-column))))) - nil 'visible)))))) + (let ((buffer (current-buffer))) + (ignore-errors + (walk-windows + (lambda (w) + (set-buffer (window-buffer w)) + (when (eq major-mode 'gnus-article-mode) + (let ((old-line (count-lines (point-min) (point))) + (old-column (current-column))) + (goto-char (point-min)) + (while (re-search-forward "^Date:" nil t) + (let ((type (get-text-property (match-beginning 0) 'gnus-date-type))) + (when (memq type '(lapsed combined-lapsed user-format)) + (save-excursion + (article-date-ut type t (match-beginning 0))) + (forward-line 1)))) + (goto-char (point-min)) + (when (> old-column 0) + (setq old-line (1- old-line))) + (forward-line old-line) + (end-of-line) + (when (> (current-column) old-column) + (beginning-of-line) + (forward-char old-column))))) + nil 'visible)) + (set-buffer buffer)))) (defun gnus-start-date-timer (&optional n) "Start a timer to update the Date headers in the article buffers. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-01-30 01:46:32 +0000 +++ lisp/gnus/nnimap.el 2011-01-31 04:41:38 +0000 @@ -1589,17 +1589,14 @@ (goto-char (point-max)) (while (and (setq openp (memq (process-status process) '(open run))) - (not (re-search-backward - (format "^%d .*\n" sequence) - (if nnimap-streaming - (max (point-min) - (min - (- (point) 500) - (save-excursion - (forward-line -3) - (point)))) - (point-min)) - t))) + (progn + ;; Skip past any "*" lines that the server has + ;; output. + (while (and (not (bobp)) + (progn + (forward-line -1) + (looking-at "\\*")))) + (not (looking-at (format "%d " sequence))))) (when messagep (nnheader-message 7 "nnimap read %dk" (/ (buffer-size) 1000))) (nnheader-accept-process-output process) ------------------------------------------------------------ revno: 103042 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-01-31 03:35:09 +0000 message: nntp.el (nntp-retrieve-group-data-early, nntp-finish-retrieve-group-infos): Implement the asynchronous data fetching functions. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-31 02:49:29 +0000 +++ lisp/gnus/ChangeLog 2011-01-31 03:35:09 +0000 @@ -4,6 +4,10 @@ 2011-01-31 Lars Ingebrigtsen + * nntp.el (nntp-retrieve-group-data-early) + (nntp-finish-retrieve-group-infos): Implement the asynchronous data + fetching functions. + * gnus-start.el (gnus-read-active-for-groups): Read the active files thoroughly for all backends that have no known groups. This should allow new nnml methods to retrieve mail. === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2011-01-26 08:36:39 +0000 +++ lisp/gnus/nntp.el 2011-01-31 03:35:09 +0000 @@ -774,6 +774,62 @@ (nntp-copy-to-buffer nntp-server-buffer (point-min) (point-max)) 'headers))))) +(deffoo nntp-retrieve-group-data-early (server infos) + "Retrieve group info on INFOS." + (nntp-with-open-group nil server + (when (nntp-find-connection-buffer nntp-server-buffer) + ;; The first time this is run, this variable is `try'. So we + ;; try. + (when (eq nntp-server-list-active-group 'try) + (nntp-try-list-active (gnus-group-real-name (gnus-info-group (car infos))))) + (with-current-buffer (nntp-find-connection-buffer nntp-server-buffer) + (erase-buffer) + (let ((nntp-inhibit-erase t) + (command (if nntp-server-list-active-group + "LIST ACTIVE" "GROUP"))) + (dolist (info infos) + (nntp-send-command + nil command (gnus-group-real-name (gnus-info-group info))))) + (length infos))))) + +(deffoo nntp-finish-retrieve-group-infos (server infos count) + (nntp-with-open-group nil server + (let ((buf (nntp-find-connection-buffer nntp-server-buffer)) + (method (gnus-find-method-for-group + (gnus-info-group (car infos)) + (car infos))) + (received 0) + (last-point 1)) + (when buf + (with-current-buffer buf + (while (and (gnus-buffer-live-p buf) + (progn + (goto-char last-point) + ;; Count replies. + (while (re-search-forward "^[0-9]" nil t) + (incf received)) + (setq last-point (point)) + (< received count))) + (nntp-accept-response)) + ;; We now have all the entries. Remove CRs. + (goto-char (point-min)) + (while (search-forward "\r" nil t) + (replace-match "" t t)) + + (if (not nntp-server-list-active-group) + (progn + (nntp-copy-to-buffer nntp-server-buffer + (point-min) (point-max)) + (gnus-groups-to-gnus-format method gnus-active-hashtb t)) + ;; We have read active entries, so we just delete the + ;; superfluous gunk. + (goto-char (point-min)) + (while (re-search-forward "^[.2-5]" nil t) + (delete-region (match-beginning 0) + (progn (forward-line 1) (point)))) + (nntp-copy-to-buffer nntp-server-buffer (point-min) (point-max)) + (gnus-active-to-gnus-format method gnus-active-hashtb nil t))))))) + (deffoo nntp-retrieve-groups (groups &optional server) "Retrieve group info on GROUPS." (nntp-with-open-group ------------------------------------------------------------ revno: 103041 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-01-31 02:55:13 +0000 message: gnus-art.el (article-make-date-line): Fix last change. diff: === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-01-31 02:49:29 +0000 +++ lisp/gnus/gnus-art.el 2011-01-31 02:55:13 +0000 @@ -3479,8 +3479,8 @@ (defun article-make-date-line (date type) "Return a DATE line of TYPE." - (unless (memq type '(local ut original user iso8601 lapsed english - combined-lapsed user-defined)) + (unless (memq type '(local ut original user-defined iso8601 lapsed english + combined-lapsed)) (error "Unknown conversion type: %s" type)) (condition-case () (let ((time (date-to-time date))) ------------------------------------------------------------ revno: 103040 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-01-31 02:49:29 +0000 message: gnus-art.el (article-make-date-line): Work for user-defined format. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-31 02:19:13 +0000 +++ lisp/gnus/ChangeLog 2011-01-31 02:49:29 +0000 @@ -1,3 +1,7 @@ +2011-01-31 Katsumi Yamaoka + + * gnus-art.el (article-make-date-line): Work for user-defined format. + 2011-01-31 Lars Ingebrigtsen * gnus-start.el (gnus-read-active-for-groups): Read the active files === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-01-31 02:01:24 +0000 +++ lisp/gnus/gnus-art.el 2011-01-31 02:49:29 +0000 @@ -3480,7 +3480,7 @@ (defun article-make-date-line (date type) "Return a DATE line of TYPE." (unless (memq type '(local ut original user iso8601 lapsed english - combined-lapsed)) + combined-lapsed user-defined)) (error "Unknown conversion type: %s" type)) (condition-case () (let ((time (date-to-time date))) @@ -3508,7 +3508,7 @@ (substring date 0 (match-beginning 0)) date))) ;; Let the user define the format. - ((eq type 'user) + ((eq type 'user-defined) (let ((format (or (condition-case nil (with-current-buffer gnus-summary-buffer gnus-article-time-format) ------------------------------------------------------------ revno: 103039 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-01-31 02:19:13 +0000 message: gnus-start.el (gnus-read-active-for-groups): Read the active files thoroughly for all backends that have no known groups. This should allow new nnml methods to retrieve mail. gnus-group.el (gnus-group-jump-to-group): Allow jumping to groups that Gnus doesn't know exists again. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-31 02:01:24 +0000 +++ lisp/gnus/ChangeLog 2011-01-31 02:19:13 +0000 @@ -1,5 +1,12 @@ 2011-01-31 Lars Ingebrigtsen + * gnus-start.el (gnus-read-active-for-groups): Read the active files + thoroughly for all backends that have no known groups. This should + allow new nnml methods to retrieve mail. + + * gnus-group.el (gnus-group-jump-to-group): Allow jumping to groups + that Gnus doesn't know exists again. + * gnus-art.el (gnus-article-date-lapsed-new-header): Removed. (gnus-treat-date-ut): Ditto. (gnus-article-update-date-header): Renamed. === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-01-28 11:27:24 +0000 +++ lisp/gnus/gnus-group.el 2011-01-31 02:19:13 +0000 @@ -2467,7 +2467,7 @@ `gnus-group-jump-to-group-prompt'." (interactive (list (gnus-group-completing-read - nil nil t + nil nil nil (if current-prefix-arg (cdr (assq current-prefix-arg gnus-group-jump-to-group-prompt)) (or (and (stringp gnus-group-jump-to-group-prompt) === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-start.el 2011-01-31 02:19:13 +0000 @@ -1743,11 +1743,13 @@ (cond ((and (gnus-check-backend-function 'finish-retrieve-group-infos (car method)) + infos (or (not (gnus-agent-method-p method)) (gnus-online method))) (gnus-finish-retrieve-group-infos method infos early-data) (gnus-agent-save-active method)) - ((gnus-check-backend-function 'retrieve-groups (car method)) + ((and (gnus-check-backend-function 'retrieve-groups (car method)) + infos) (when (gnus-check-backend-function 'request-scan (car method)) (gnus-request-scan nil method)) (let (groups) ------------------------------------------------------------ revno: 103038 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-01-31 02:01:24 +0000 message: gnus-art.el: Rewrite the Date header formatting functionality. The user can now have infinitely many Date headers. This change should be pretty much backwards-compatible, even though many customisation variables have been removed. gnus.texi (Customizing Articles): Document the new way of customizing the date headers(s). diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-01-30 02:51:45 +0000 +++ doc/misc/ChangeLog 2011-01-31 02:01:24 +0000 @@ -1,3 +1,8 @@ +2011-01-31 Lars Ingebrigtsen + + * gnus.texi (Customizing Articles): Document the new way of customizing + the date headers(s). + 2011-01-30 Lars Ingebrigtsen * gnus.texi (Client-Side IMAP Splitting): Add a complete nnimap fancy === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-01-30 02:51:45 +0000 +++ doc/misc/gnus.texi 2011-01-31 02:01:24 +0000 @@ -9492,23 +9492,15 @@ (@code{gnus-article-date-lapsed}). It looks something like: @example -X-Sent: 6 weeks, 4 days, 1 hour, 3 minutes, 8 seconds ago +Date: 6 weeks, 4 days, 1 hour, 3 minutes, 8 seconds ago @end example -@vindex gnus-article-date-lapsed-new-header -The value of @code{gnus-article-date-lapsed-new-header} determines -whether this header will just be added below the old Date one, or will -replace it. - -An advantage of using Gnus to read mail is that it converts simple bugs -into wonderful absurdities. - This line is updated continually by default. If you wish to switch that off, say: -@vindex gnus-article-update-lapsed-header +@vindex gnus-article-update-date-headers @lisp -(setq gnus-article-update-lapsed-header nil) +(setq gnus-article-update-date-headers nil) @end lisp in your @file{~/.gnus.el} file. If you want to stop the updating @@ -11878,13 +11870,7 @@ @vindex gnus-treat-strip-trailing-blank-lines @vindex gnus-treat-unsplit-urls @vindex gnus-treat-wash-html -@vindex gnus-treat-date-english -@vindex gnus-treat-date-iso8601 -@vindex gnus-treat-date-lapsed -@vindex gnus-treat-date-local -@vindex gnus-treat-date-original -@vindex gnus-treat-date-user-defined -@vindex gnus-treat-date-ut +@vindex gnus-treat-date @vindex gnus-treat-from-picon @vindex gnus-treat-mail-picon @vindex gnus-treat-newsgroups-picon @@ -11939,13 +11925,39 @@ @xref{Article Washing}. -@item gnus-treat-date-english (head) -@item gnus-treat-date-iso8601 (head) -@item gnus-treat-date-lapsed (head) -@item gnus-treat-date-local (head) -@item gnus-treat-date-original (head) -@item gnus-treat-date-user-defined (head) -@item gnus-treat-date-ut (head) +@item gnus-treat-date (head) + +This will transform/add date headers according to the +@code{gnus-article-date-headers} variable. This is a list of Date +headers to display. The formats available are: + +@table @code +@item ut +Universal time, aka GMT, aka ZULU. + +@item local +The user's local time zone. + +@item english +A semi-readable English sentence. + +@item lapsed +The time elapsed since the message was posted. + +@item combined-elapsed +Both the original date header and a (shortened) elapsed time. + +@item original +The original date header. + +@item iso8601 +ISO8601 format, i.e., ``2010-11-23T22:05:21''. + +@item user-defined +A format done according to the @code{gnus-article-time-format} +variable. + +@end table @xref{Article Date}. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-30 03:00:34 +0000 +++ lisp/gnus/ChangeLog 2011-01-31 02:01:24 +0000 @@ -1,3 +1,20 @@ +2011-01-31 Lars Ingebrigtsen + + * gnus-art.el (gnus-article-date-lapsed-new-header): Removed. + (gnus-treat-date-ut): Ditto. + (gnus-article-update-date-header): Renamed. + (gnus-treat-date-local): Removed. + (gnus-treat-date-english): Removed. + (gnus-treat-date-lapsed): Removed. + (gnus-treat-date-combined-lapsed): Removed. + (gnus-treat-date-original): Removed. + (gnus-treat-date-iso8601): Removed. + (gnus-treat-date-user-defined): Removed. + (gnus-article-date-headers): New variable to control all the date + header options. + (article-date-ut): Rewrite to allow using the new way to format date + headers(s). + 2011-01-30 Lars Ingebrigtsen * nnmail.el (nnmail-article-group): Check for a direct fancy split === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-01-29 02:29:38 +0000 +++ lisp/gnus/gnus-art.el 2011-01-31 02:01:24 +0000 @@ -168,7 +168,7 @@ :group 'gnus-article-hiding) (defcustom gnus-visible-headers - "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^Followup-To:\\|^Reply-To:\\|^Organization:\\|^Summary:\\|^Keywords:\\|^To:\\|^[BGF]?Cc:\\|^Posted-To:\\|^Mail-Copies-To:\\|^Mail-Followup-To:\\|^Apparently-To:\\|^Gnus-Warning:\\|^Resent-From:\\|^X-Sent:" + "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^Followup-To:\\|^Reply-To:\\|^Organization:\\|^Summary:\\|^Keywords:\\|^To:\\|^[BGF]?Cc:\\|^Posted-To:\\|^Mail-Copies-To:\\|^Mail-Followup-To:\\|^Apparently-To:\\|^Gnus-Warning:\\|^Resent-From:" "*All headers that do not match this regexp will be hidden. This variable can also be a list of regexp of headers to remain visible. If this variable is non-nil, `gnus-ignored-headers' will be ignored." @@ -1014,17 +1014,46 @@ :group 'gnus-article-mime :type '(repeat (cons :format "%v" (string :tag "MIME type") function))) -(defcustom gnus-article-date-lapsed-new-header nil - "Whether the X-Sent and Date headers can coexist. -When using `gnus-treat-date-lapsed', the \"X-Sent:\" header will -either replace the old \"Date:\" header (if this variable is nil), or -be added below it (otherwise)." - :version "21.1" +(defcustom gnus-article-date-headers + (let ((types '(ut local english lapsed combined-lapsed + iso8601 original user-defined)) + default) + (dolist (type types) + (let ((variable (intern (format "gnus-treat-date-%s" type)))) + (when (and (boundp variable) + (symbol-value variable)) + (push type default)))) + (when (and (or (not (boundp (intern "gnus-article-date-lapsed-new-header"))) + (not (symbol-value (intern "gnus-article-date-lapsed-new-header")))) + (memq 'lapsed default)) + (setq default (delq 'lapsed default))) + (or default + '(combined-lapsed))) + "A list of Date header formats to display. +Valid formats are `ut' (universal time), `local' (local time +zone), `english' (readable English), `lapsed' (elapsed time), +`combined-lapsed' (both the original date and the elapsed time), +`original' (the original date header), `iso8601' (ISO8601 +format), and `user-defined' (a user-defined format defined by the +`gnus-article-time-format' variable). + +You have as many date headers as you want in the article buffer. +Some of these headers are updated automatically. See +`gnus-article-update-date-headers' for details." + :version "24.1" :group 'gnus-article-headers - :type 'boolean) + :type '(repeat + (item :tag "Universal time (UT)" :value 'ut) + (item :tag "Local time zone" :value 'local) + (item :tag "Readable English" :value 'english) + (item :tag "Elapsed time" :value 'lapsed) + (item :tag "Original and elapsed time" :value 'combined-lapsed) + (item :tag "Original date header" :value 'original) + (item :tag "ISO8601 format" :value 'iso8601) + (item :tag "User-defined" :value 'user-defined))) -(defcustom gnus-article-update-lapsed-header 1 - "How often to update the lapsed date header. +(defcustom gnus-article-update-date-headers 1 + "How often to update the date header. If nil, don't update it at all." :version "24.1" :group 'gnus-article-headers @@ -1135,6 +1164,15 @@ :type gnus-article-treat-head-custom) (put 'gnus-treat-buttonize-head 'highlight t) +(defcustom gnus-treat-date 'head + "Display dates according to the `gnus-article-date-headers' variable. +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." + :version "24.1" + :group 'gnus-article-treat + :link '(custom-manual "(gnus)Customizing Articles") + :type gnus-article-treat-head-custom) + (defcustom gnus-treat-emphasize 50000 "Emphasize text. Valid values are nil, t, `head', `first', `last', an integer or a @@ -1266,73 +1304,6 @@ :type gnus-article-treat-custom) (put 'gnus-treat-highlight-citation 'highlight t) -(defcustom gnus-treat-date-ut nil - "Display the Date in UT (GMT). -Valid values are nil, t, `head', `first', `last', an integer or a -predicate. See Info node `(gnus)Customizing Articles'." - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-head-custom) - -(defcustom gnus-treat-date-local nil - "Display the Date in the local timezone. -Valid values are nil, t, `head', `first', `last', an integer or a -predicate. See Info node `(gnus)Customizing Articles'." - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-head-custom) - -(defcustom gnus-treat-date-english nil - "Display the Date in a format that can be read aloud in English. -Valid values are nil, t, `head', `first', `last', an integer or a -predicate. See Info node `(gnus)Customizing Articles'." - :version "22.1" - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-head-custom) - -(defcustom gnus-treat-date-lapsed nil - "Display the Date header in a way that says how much time has elapsed. -Valid values are nil, t, `head', `first', `last', an integer or a -predicate. See Info node `(gnus)Customizing Articles'." - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-head-custom) - -(defcustom gnus-treat-date-combined-lapsed 'head - "Display the Date header in a way that says how much time has elapsed. -Valid values are nil, t, `head', `first', `last', an integer or a -predicate. See Info node `(gnus)Customizing Articles'." - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-head-custom) - -(defcustom gnus-treat-date-original nil - "Display the date in the original timezone. -Valid values are nil, t, `head', `first', `last', an integer or a -predicate. See Info node `(gnus)Customizing Articles'." - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-head-custom) - -(defcustom gnus-treat-date-iso8601 nil - "Display the date in the ISO8601 format. -Valid values are nil, t, `head', `first', `last', an integer or a -predicate. See Info node `(gnus)Customizing Articles'." - :version "21.1" - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-head-custom) - -(defcustom gnus-treat-date-user-defined nil - "Display the date in a user-defined format. -The format is defined by the `gnus-article-time-format' variable. -Valid values are nil, t, `head', `first', `last', an integer or a -predicate. See Info node `(gnus)Customizing Articles'." - :group 'gnus-article-treat - :link '(custom-manual "(gnus)Customizing Articles") - :type gnus-article-treat-head-custom) - (defcustom gnus-treat-strip-headers-in-body t "Strip the X-No-Archive header line from the beginning of the body. Valid values are nil, t, `head', `first', `last', an integer or a @@ -1690,14 +1661,6 @@ (gnus-treat-fill-long-lines gnus-article-fill-cited-long-lines) (gnus-treat-strip-cr gnus-article-remove-cr) (gnus-treat-unsplit-urls gnus-article-unsplit-urls) - (gnus-treat-date-ut gnus-article-date-ut) - (gnus-treat-date-local gnus-article-date-local) - (gnus-treat-date-english gnus-article-date-english) - (gnus-treat-date-original gnus-article-date-original) - (gnus-treat-date-user-defined gnus-article-date-user) - (gnus-treat-date-iso8601 gnus-article-date-iso8601) - (gnus-treat-date-lapsed gnus-article-date-lapsed) - (gnus-treat-date-combined-lapsed gnus-article-date-combined-lapsed) (gnus-treat-display-x-face gnus-article-display-x-face) (gnus-treat-display-face gnus-article-display-face) (gnus-treat-hide-headers gnus-article-maybe-hide-headers) @@ -1709,6 +1672,7 @@ (gnus-treat-mail-picon gnus-treat-mail-picon) (gnus-treat-newsgroups-picon gnus-treat-newsgroups-picon) (gnus-treat-strip-pem gnus-article-hide-pem) + (gnus-treat-date gnus-article-treat-date) (gnus-treat-from-gravatar gnus-treat-from-gravatar) (gnus-treat-mail-gravatar gnus-treat-mail-gravatar) (gnus-treat-highlight-headers gnus-article-highlight-headers) @@ -3441,25 +3405,18 @@ (forward-line 1) (setq ended t))))) -(defun article-date-ut (&optional type highlight) - "Convert DATE date to universal time in the current article. -If TYPE is `local', convert to local time; if it is `lapsed', output -how much time has lapsed since DATE. For `lapsed', the value of -`gnus-article-date-lapsed-new-header' says whether the \"X-Sent:\" header -should replace the \"Date:\" one, or should be added below it." +(defun article-treat-date () + (article-date-ut gnus-article-date-headers t)) + +(defun article-date-ut (&optional type highlight date-position) + "Convert DATE date to TYPE in the current article. +The default type is `ut'. See `gnus-article-date-headers' for +possible values." (interactive (list 'ut t)) - (let* ((tdate-regexp "^Date:[ \t]\\|^X-Sent:[ \t]") - (date-regexp (cond ((not gnus-article-date-lapsed-new-header) - tdate-regexp) - ((eq type 'lapsed) - "^X-Sent:[ \t]") - (article-lapsed-timer - "^Date:[ \t]") - (t - tdate-regexp))) - (case-fold-search t) + (let* ((case-fold-search t) (inhibit-read-only t) (inhibit-point-motion-hooks t) + (first t) pos date bface eface) (save-excursion (save-restriction @@ -3481,37 +3438,41 @@ (1+ (point)))) (point-max))) (goto-char (point-min)) - (when (re-search-forward tdate-regexp nil t) + (when (re-search-forward "^Date:" nil t) (setq bface (get-text-property (point-at-bol) 'face) eface (get-text-property (1- (point-at-eol)) 'face))) (goto-char (point-min)) - (setq pos nil) ;; Delete any old Date headers. - (while (re-search-forward date-regexp nil t) - (if pos - (delete-region (point-at-bol) (progn - (gnus-article-forward-header) - (point))) + (if date-position + (progn + (goto-char date-position) + (delete-region (point) + (progn + (gnus-article-forward-header) + (point)))) + (while (re-search-forward "^Date:" nil t) (delete-region (point-at-bol) (progn (gnus-article-forward-header) - (forward-char -1) - (point))) - (setq pos (point)))) - (when (and (not pos) - (re-search-forward tdate-regexp nil t)) - (forward-line 1)) - (gnus-goto-char pos) - (insert (article-make-date-line date (or type 'ut))) - (unless pos - (insert "\n") - (forward-line -1)) - ;; Do highlighting. - (beginning-of-line) - (when (looking-at "\\([^:]+\\): *\\(.*\\)$") - (put-text-property (match-beginning 1) (1+ (match-end 1)) - 'face bface) - (put-text-property (match-beginning 2) (match-end 2) - 'face eface)) + (point))))) + (dolist (this-type (cond + ((null type) + (list 'ut)) + ((atom type) + (list type)) + (t + type))) + (insert (article-make-date-line date (or this-type 'ut)) "\n") + (forward-line -1) + (put-text-property (line-beginning-position) + (1+ (line-beginning-position)) + 'gnus-date-type this-type) + ;; Do highlighting. + (beginning-of-line) + (when (looking-at "\\([^:]+\\): *\\(.*\\)$") + (put-text-property (match-beginning 1) (1+ (match-end 1)) + 'face bface) + (put-text-property (match-beginning 2) (match-end 2) + 'face eface))) (put-text-property (point-min) (1- (point-max)) 'original-date date) (goto-char (point-max)) (widen)))))) @@ -3565,9 +3526,9 @@ (format "%s%02d%02d" (if (> tz 0) "+" "-") (/ (abs tz) 3600) (/ (% (abs tz) 3600) 60))))) - ;; Do an X-Sent lapsed format. + ;; Do a lapsed format. ((eq type 'lapsed) - (concat "X-Sent: " (article-lapsed-string time))) + (concat "Date: " (article-lapsed-string time))) ;; A combined date/lapsed format. ((eq type 'combined-lapsed) (let ((date-string (article-make-date-line date 'original)) @@ -3695,11 +3656,12 @@ (let ((old-line (count-lines (point-min) (point))) (old-column (current-column))) (goto-char (point-min)) - (when (re-search-forward "^X-Sent:\\|^Date:" nil t) - (when gnus-treat-date-combined-lapsed - (article-date-combined-lapsed t)) - (when gnus-treat-date-lapsed - (article-date-lapsed t))) + (while (re-search-forward "^Date:" nil t) + (let ((type (get-text-property (match-beginning 0) 'gnus-date-type))) + (when (memq type '(lapsed combined-lapsed user-format)) + (save-excursion + (article-date-ut type t (match-beginning 0))) + (forward-line 1)))) (goto-char (point-min)) (when (> old-column 0) (setq old-line (1- old-line))) @@ -3711,7 +3673,7 @@ nil 'visible)))))) (defun gnus-start-date-timer (&optional n) - "Start a timer to update the X-Sent header in the article buffers. + "Start a timer to update the Date headers in the article buffers. The numerical prefix says how frequently (in seconds) the function is to run." (interactive "p") @@ -3722,7 +3684,7 @@ (run-at-time 1 n 'article-update-date-lapsed))) (defun gnus-stop-date-timer () - "Stop the X-Sent timer." + "Stop the Date timer." (interactive) (when article-lapsed-timer (nnheader-cancel-timer article-lapsed-timer) @@ -4347,6 +4309,7 @@ article-date-english article-date-iso8601 article-date-original + article-treat-date article-date-ut article-decode-mime-words article-decode-charset @@ -4550,9 +4513,9 @@ (setq gnus-summary-buffer (gnus-summary-buffer-name gnus-newsgroup-name)) (gnus-summary-set-local-parameters gnus-newsgroup-name) - (when (and gnus-article-update-lapsed-header + (when (and gnus-article-update-date-headers (not article-lapsed-timer)) - (gnus-start-date-timer gnus-article-update-lapsed-header)) + (gnus-start-date-timer gnus-article-update-date-headers)) (current-buffer))))) ;; Set article window start at LINE, where LINE is the number of lines ------------------------------------------------------------ revno: 103037 [merge] committer: Paul Eggert branch nick: trunk timestamp: Sun 2011-01-30 15:35:29 -0800 message: strftime: import from gnulib diff: === modified file 'ChangeLog' --- ChangeLog 2011-01-30 19:22:02 +0000 +++ ChangeLog 2011-01-30 23:34:18 +0000 @@ -1,5 +1,21 @@ 2011-01-30 Paul Eggert + strftime: import from gnulib + * Makefile.in (GNULIB_MODULES): Add strftime. + * configure.in (AC_FUNC_STRFTIME, my_strftime): Remove; no longer + needed. + * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4: + Regenerate. + * lib/strftime.c, lib/strftime.h, lib/stdbool.in.h: New files, + imported from gnulib. + * m4/strftime.m4, m4/stdbool.m4, m4/tm_gmtoff.m4: Likewise. + This incorporates many changes from gnulib, including simpler + handling of multibyte formats, porting to mingw32 and other + platforms, and support for higher-resolution time stamps. + Emacs does not yet use the higher-resolution interface. + +2011-01-30 Paul Eggert + gnulib: import mktime and move-if-change fixes from gnulib * configure: Regenerate from the following. === modified file 'Makefile.in' --- Makefile.in 2011-01-28 00:25:24 +0000 +++ Makefile.in 2011-01-30 23:34:18 +0000 @@ -330,7 +330,7 @@ # Update modules from gnulib, for maintainers, who should have it in # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools # as per $(gnulib_srcdir)/DEPENDENCIES. -GNULIB_MODULES = dtoastr getopt-gnu mktime +GNULIB_MODULES = dtoastr getopt-gnu mktime strftime GNULIB_TOOL_FLAGS = \ --import --no-changelog --no-vc-files --makefile-name=gnulib.mk sync-from-gnulib: $(gnulib_srcdir) === modified file 'aclocal.m4' --- aclocal.m4 2011-01-27 07:24:57 +0000 +++ aclocal.m4 2011-01-30 23:34:18 +0000 @@ -993,8 +993,11 @@ m4_include([m4/include_next.m4]) m4_include([m4/mktime.m4]) m4_include([m4/multiarch.m4]) +m4_include([m4/stdbool.m4]) m4_include([m4/stddef_h.m4]) +m4_include([m4/strftime.m4]) m4_include([m4/time_h.m4]) m4_include([m4/time_r.m4]) +m4_include([m4/tm_gmtoff.m4]) m4_include([m4/unistd_h.m4]) m4_include([m4/wchar_t.m4]) === modified file 'admin/ChangeLog' --- admin/ChangeLog 2011-01-25 05:10:02 +0000 +++ admin/ChangeLog 2011-01-30 23:34:18 +0000 @@ -1,3 +1,8 @@ +2011-01-30 Paul Eggert + + strftime: import from gnulib + * notes/copyright: strftime.c moved from src to lib. + 2011-01-25 Glenn Morris * bzrmerge.el (bzrmerge-skip-regexp): New variable. === modified file 'admin/notes/copyright' --- admin/notes/copyright 2011-01-25 04:08:28 +0000 +++ admin/notes/copyright 2011-01-30 23:34:18 +0000 @@ -635,7 +635,6 @@ src/gmalloc.c src/md5.c src/md5.h - src/strftime.c src/termcap.c src/tparam.c === modified file 'configure' --- configure 2011-01-30 19:22:02 +0000 +++ configure 2011-01-30 23:34:18 +0000 @@ -682,6 +682,8 @@ STDDEF_H HAVE_WCHAR_T REPLACE_NULL +HAVE__BOOL +STDBOOL_H APPLE_UNIVERSAL_BUILD REPLACE_TIMEGM REPLACE_NANOSLEEP @@ -2658,6 +2660,7 @@ gl_getopt_required=GNU as_fn_append ac_header_list " getopt.h" as_fn_append ac_func_list " alarm" +as_fn_append ac_func_list " tzset" as_fn_append ac_header_list " sys/time.h" as_fn_append ac_func_list " localtime_r" # Check that the precious variables saved in the cache have kept the same @@ -5827,7 +5830,9 @@ # Code from module intprops: # Code from module mktime: # Code from module multiarch: + # Code from module stdbool: # Code from module stddef: + # Code from module strftime: # Code from module time: # Code from module time_r: # Code from module unistd: @@ -14400,6 +14405,97 @@ ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } +if ${ac_cv_header_stdbool_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; + +int +main () +{ + + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdbool_h=yes +else + ac_cv_header_stdbool_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 +$as_echo "$ac_cv_header_stdbool_h" >&6; } + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +if test "x$ac_cv_type__Bool" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE__BOOL 1 +_ACEOF + + +fi + + if test $ac_cv_header_stdbool_h = yes; then + +$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h + + fi REPLACE_NULL=0; HAVE_WCHAR_T=1; @@ -14438,6 +14534,18 @@ fi + + ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include +" +if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then : + +$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h + +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 $as_echo_n "checking for C/C++ restrict keyword... " >&6; } if ${ac_cv_c_restrict+:} false; then : @@ -14998,6 +15106,26 @@ # Code from module multiarch: + # Code from module stdbool: + + + + # Define two additional variables used in the Makefile substitution. + + if test "$ac_cv_header_stdbool_h" = yes; then + STDBOOL_H='' + else + STDBOOL_H='stdbool.h' + fi + + + if test "$ac_cv_type__Bool" = yes; then + HAVE__BOOL=1 + else + HAVE__BOOL=0 + fi + + # Code from module stddef: @@ -15093,6 +15221,32 @@ fi + # Code from module strftime: + + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strftime.$ac_objext" + + + # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. + + + + + + + +$as_echo "#define my_strftime nstrftime" >>confdefs.h + + + # Code from module time: @@ -15292,62 +15446,6 @@ -for ac_func in strftime -do : - ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" -if test "x$ac_cv_func_strftime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRFTIME 1 -_ACEOF - -else - # strftime is in -lintl on SCO UNIX. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 -$as_echo_n "checking for strftime in -lintl... " >&6; } -if ${ac_cv_lib_intl_strftime+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strftime (); -int -main () -{ -return strftime (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_strftime=yes -else - ac_cv_lib_intl_strftime=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 -$as_echo "$ac_cv_lib_intl_strftime" >&6; } -if test "x$ac_cv_lib_intl_strftime" = xyes; then : - $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h - -LIBS="-lintl $LIBS" -fi - -fi -done - - # UNIX98 PTYs. for ac_func in grantpt do : === modified file 'configure.in' --- configure.in 2011-01-25 04:08:28 +0000 +++ configure.in 2011-01-30 23:34:18 +0000 @@ -517,7 +517,7 @@ machine=hp800 opsys=hpux11 ## FIXME. Peter O'Gorman reports that dumping using unexelf.o doesn't ## work either: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6811 - CANNOT_DUMP=yes + CANNOT_DUMP=yes ;; hppa*-*-linux-gnu* ) @@ -2675,8 +2675,6 @@ gl_ASSERT_NO_GNULIB_TESTS gl_INIT -AC_FUNC_STRFTIME - # UNIX98 PTYs. AC_CHECK_FUNCS(grantpt) @@ -3528,8 +3526,6 @@ #endif #endif -#define my_strftime nstrftime /* for strftime.c */ - /* These default definitions are good for almost all machines. The exceptions override them in m/MACHINE.h. */ === modified file 'lib/Makefile.in' --- lib/Makefile.in 2011-01-27 07:24:57 +0000 +++ lib/Makefile.in 2011-01-30 23:34:18 +0000 @@ -24,7 +24,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime strftime VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -54,10 +54,11 @@ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gl-comp.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/stdbool.m4 \ + $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/strftime.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -232,6 +233,7 @@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_XSERVER = @HAVE_XSERVER@ +HAVE__BOOL = @HAVE__BOOL@ IMAGEMAGICK_CFLAGS = @IMAGEMAGICK_CFLAGS@ IMAGEMAGICK_LIBS = @IMAGEMAGICK_LIBS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -363,6 +365,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ START_FILES = @START_FILES@ +STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ STRIP = @STRIP@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ @@ -467,23 +470,24 @@ # statements but through direct file reference. Therefore this snippet must be # present in all Makefile.am that need it. This is ensured by the applicability # 'all' defined above. -BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) $(STDDEF_H) time.h \ - unistd.h warn-on-use.h +BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) $(STDBOOL_H) \ + $(STDDEF_H) time.h unistd.h warn-on-use.h EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \ ftoastr.c ftoastr.h getopt.c getopt.in.h getopt1.c \ - getopt_int.h intprops.h mktime-internal.h mktime.c stddef.in.h \ - time.in.h time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h + getopt_int.h intprops.h mktime-internal.h mktime.c \ + stdbool.in.h stddef.in.h strftime.c strftime.h time.in.h \ + time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ - c++defs.h c++defs.h-t getopt.h getopt.h-t stddef.h stddef.h-t \ - time.h time.h-t unistd.h unistd.h-t warn-on-use.h \ - warn-on-use.h-t + c++defs.h c++defs.h-t getopt.h getopt.h-t stdbool.h \ + stdbool.h-t stddef.h stddef.h-t time.h time.h-t unistd.h \ + unistd.h-t warn-on-use.h warn-on-use.h-t noinst_LIBRARIES = libgnu.a DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src libgnu_a_SOURCES = dtoastr.c gettext.h libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = ftoastr.c getopt.c getopt1.c mktime.c \ - time_r.c + strftime.c time_r.c ARG_NONNULL_H = arg-nonnull.h CXXDEFS_H = c++defs.h WARN_ON_USE_H = warn-on-use.h @@ -541,6 +545,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strftime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ .c.o: @@ -789,6 +794,15 @@ } > $@-t && \ mv -f $@-t $@ +# We need the following in order to create when the system +# doesn't have one that works. +stdbool.h: stdbool.in.h + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ + } > $@-t && \ + mv $@-t $@ + # We need the following in order to create when the system # doesn't have one that works with the given compiler. stddef.h: stddef.in.h === modified file 'lib/gnulib.mk' --- lib/gnulib.mk 2011-01-12 06:13:06 +0000 +++ lib/gnulib.mk 2011-01-30 23:34:18 +0000 @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime strftime MOSTLYCLEANFILES += core *.stackdump @@ -127,6 +127,24 @@ ## end gnulib module mktime +## begin gnulib module stdbool + +BUILT_SOURCES += $(STDBOOL_H) + +# We need the following in order to create when the system +# doesn't have one that works. +stdbool.h: stdbool.in.h + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ + } > $@-t && \ + mv $@-t $@ +MOSTLYCLEANFILES += stdbool.h stdbool.h-t + +EXTRA_DIST += stdbool.in.h + +## end gnulib module stdbool + ## begin gnulib module stddef BUILT_SOURCES += $(STDDEF_H) @@ -151,6 +169,15 @@ ## end gnulib module stddef +## begin gnulib module strftime + + +EXTRA_DIST += strftime.c strftime.h + +EXTRA_libgnu_a_SOURCES += strftime.c + +## end gnulib module strftime + ## begin gnulib module time BUILT_SOURCES += time.h === added file 'lib/stdbool.in.h' --- lib/stdbool.in.h 1970-01-01 00:00:00 +0000 +++ lib/stdbool.in.h 2011-01-30 23:34:18 +0000 @@ -0,0 +1,122 @@ +/* Copyright (C) 2001-2003, 2006-2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef _GL_STDBOOL_H +#define _GL_STDBOOL_H + +/* ISO C 99 for platforms that lack it. */ + +/* Usage suggestions: + + Programs that use should be aware of some limitations + and standards compliance issues. + + Standards compliance: + + - must be #included before 'bool', 'false', 'true' + can be used. + + - You cannot assume that sizeof (bool) == 1. + + - Programs should not undefine the macros bool, true, and false, + as C99 lists that as an "obsolescent feature". + + Limitations of this substitute, when used in a C89 environment: + + - must be #included before the '_Bool' type can be used. + + - You cannot assume that _Bool is a typedef; it might be a macro. + + - Bit-fields of type 'bool' are not supported. Portable code + should use 'unsigned int foo : 1;' rather than 'bool foo : 1;'. + + - In C99, casts and automatic conversions to '_Bool' or 'bool' are + performed in such a way that every nonzero value gets converted + to 'true', and zero gets converted to 'false'. This doesn't work + with this substitute. With this substitute, only the values 0 and 1 + give the expected result when converted to _Bool' or 'bool'. + + - C99 allows the use of (_Bool)0.0 in constant expressions, but + this substitute cannot always provide this property. + + Also, it is suggested that programs use 'bool' rather than '_Bool'; + this isn't required, but 'bool' is more common. */ + + +/* 7.16. Boolean type and values */ + +/* BeOS already #defines false 0, true 1. We use the same + definitions below, but temporarily we have to #undef them. */ +#if defined __BEOS__ && !defined __HAIKU__ +# include /* defines bool but not _Bool */ +# undef false +# undef true +#endif + +/* For the sake of symbolic names in gdb, we define true and false as + enum constants, not only as macros. + It is tempting to write + typedef enum { false = 0, true = 1 } _Bool; + so that gdb prints values of type 'bool' symbolically. But if we do + this, values of type '_Bool' may promote to 'int' or 'unsigned int' + (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' + (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the + enum; this ensures that '_Bool' promotes to 'int'. */ +#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__) + /* A compiler known to have 'bool'. */ + /* If the compiler already has both 'bool' and '_Bool', we can assume they + are the same types. */ +# if !@HAVE__BOOL@ +typedef bool _Bool; +# endif +#else +# if !defined __GNUC__ + /* If @HAVE__BOOL@: + Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when + the built-in _Bool type is used. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html + Similar bugs are likely with other compilers as well; this file + wouldn't be used if was working. + So we override the _Bool type. + If !@HAVE__BOOL@: + Need to define _Bool ourselves. As 'signed char' or as an enum type? + Use of a typedef, with SunPRO C, leads to a stupid + "warning: _Bool is a keyword in ISO C99". + Use of an enum type, with IRIX cc, leads to a stupid + "warning(1185): enumerated type mixed with another type". + Even the existence of an enum type, without a typedef, + "Invalid enumerator. (badenum)" with HP-UX cc on Tru64. + The only benefit of the enum, debuggability, is not important + with these compilers. So use 'signed char' and no enum. */ +# define _Bool signed char +# else + /* With this compiler, trust the _Bool type if the compiler has it. */ +# if !@HAVE__BOOL@ +typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; +# endif +# endif +#endif +#define bool _Bool + +/* The other macros must be usable in preprocessor directives. */ +#define false 0 +#define true 1 +#define __bool_true_false_are_defined 1 + +#endif /* _GL_STDBOOL_H */ === added file 'lib/strftime.c' --- lib/strftime.c 1970-01-01 00:00:00 +0000 +++ lib/strftime.c 2011-01-30 23:34:18 +0000 @@ -0,0 +1,1468 @@ +/* Copyright (C) 1991-2001, 2003-2007, 2009-2011 Free Software Foundation, Inc. + + NOTE: The canonical source of this file is maintained with the GNU C Library. + Bugs can be reported to bug-glibc@prep.ai.mit.edu. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifdef _LIBC +# define HAVE_STRUCT_ERA_ENTRY 1 +# define HAVE_TM_GMTOFF 1 +# define HAVE_TM_ZONE 1 +# define HAVE_TZNAME 1 +# define HAVE_TZSET 1 +# include "../locale/localeinfo.h" +#else +# include +# if FPRINTFTIME +# include "ignore-value.h" +# include "fprintftime.h" +# else +# include "strftime.h" +# endif +#endif + +#include +#include + +#if HAVE_TZNAME && !HAVE_DECL_TZNAME +extern char *tzname[]; +#endif + +/* Do multibyte processing if multibytes are supported, unless + multibyte sequences are safe in formats. Multibyte sequences are + safe if they cannot contain byte sequences that look like format + conversion specifications. The multibyte encodings used by the + C library on the various platforms (UTF-8, GB2312, GBK, CP936, + GB18030, EUC-TW, BIG5, BIG5-HKSCS, CP950, EUC-JP, EUC-KR, CP949, + SHIFT_JIS, CP932, JOHAB) are safe for formats, because the byte '%' + cannot occur in a multibyte character except in the first byte. + + The DEC-HANYU encoding used on OSF/1 is not safe for formats, but + this encoding has never been seen in real-life use, so we ignore + it. */ +#if !(defined __osf__ && 0) +# define MULTIBYTE_IS_FORMAT_SAFE 1 +#endif +#define DO_MULTIBYTE (! MULTIBYTE_IS_FORMAT_SAFE) + +#if DO_MULTIBYTE +# include + static const mbstate_t mbstate_zero; +#endif + +#include +#include +#include +#include +#include + +#ifdef COMPILE_WIDE +# include +# define CHAR_T wchar_t +# define UCHAR_T unsigned int +# define L_(Str) L##Str +# define NLW(Sym) _NL_W##Sym + +# define MEMCPY(d, s, n) __wmemcpy (d, s, n) +# define STRLEN(s) __wcslen (s) + +#else +# define CHAR_T char +# define UCHAR_T unsigned char +# define L_(Str) Str +# define NLW(Sym) Sym + +# define MEMCPY(d, s, n) memcpy (d, s, n) +# define STRLEN(s) strlen (s) + +#endif + +/* Shift A right by B bits portably, by dividing A by 2**B and + truncating towards minus infinity. A and B should be free of side + effects, and B should be in the range 0 <= B <= INT_BITS - 2, where + INT_BITS is the number of useful bits in an int. GNU code can + assume that INT_BITS is at least 32. + + ISO C99 says that A >> B is implementation-defined if A < 0. Some + implementations (e.g., UNICOS 9.0 on a Cray Y-MP EL) don't shift + right in the usual way when A < 0, so SHR falls back on division if + ordinary A >> B doesn't seem to be the usual signed shift. */ +#define SHR(a, b) \ + (-1 >> 1 == -1 \ + ? (a) >> (b) \ + : (a) / (1 << (b)) - ((a) % (1 << (b)) < 0)) + +/* Bound on length of the string representing an integer type or expression T. + Subtract 1 for the sign bit if t is signed; log10 (2.0) < 146/485; + add 1 for integer division truncation; add 1 more for a minus sign + if needed. */ +#define INT_STRLEN_BOUND(t) \ + ((sizeof (t) * CHAR_BIT - 1) * 146 / 485 + 2) + +#define TM_YEAR_BASE 1900 + +#ifndef __isleap +/* Nonzero if YEAR is a leap year (every 4 years, + except every 100th isn't, and every 400th is). */ +# define __isleap(year) \ + ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) +#endif + + +#ifdef _LIBC +# define tzname __tzname +# define tzset __tzset +#endif + +#if !HAVE_TM_GMTOFF +/* Portable standalone applications should supply a "time.h" that + declares a POSIX-compliant localtime_r, for the benefit of older + implementations that lack localtime_r or have a nonstandard one. + See the gnulib time_r module for one way to implement this. */ +# undef __gmtime_r +# undef __localtime_r +# define __gmtime_r gmtime_r +# define __localtime_r localtime_r +#endif + + +#ifndef FPRINTFTIME +# define FPRINTFTIME 0 +#endif + +#if FPRINTFTIME +# define STREAM_OR_CHAR_T FILE +# define STRFTIME_ARG(x) /* empty */ +#else +# define STREAM_OR_CHAR_T CHAR_T +# define STRFTIME_ARG(x) x, +#endif + +#if FPRINTFTIME +# define memset_byte(P, Len, Byte) \ + do { size_t _i; for (_i = 0; _i < Len; _i++) fputc (Byte, P); } while (0) +# define memset_space(P, Len) memset_byte (P, Len, ' ') +# define memset_zero(P, Len) memset_byte (P, Len, '0') +#elif defined COMPILE_WIDE +# define memset_space(P, Len) (wmemset (P, L' ', Len), (P) += (Len)) +# define memset_zero(P, Len) (wmemset (P, L'0', Len), (P) += (Len)) +#else +# define memset_space(P, Len) (memset (P, ' ', Len), (P) += (Len)) +# define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len)) +#endif + +#if FPRINTFTIME +# define advance(P, N) +#else +# define advance(P, N) ((P) += (N)) +#endif + +#define add(n, f) \ + do \ + { \ + int _n = (n); \ + int _delta = width - _n; \ + int _incr = _n + (_delta > 0 ? _delta : 0); \ + if ((size_t) _incr >= maxsize - i) \ + return 0; \ + if (p) \ + { \ + if (digits == 0 && _delta > 0) \ + { \ + if (pad == L_('0')) \ + memset_zero (p, _delta); \ + else \ + memset_space (p, _delta); \ + } \ + f; \ + advance (p, _n); \ + } \ + i += _incr; \ + } while (0) + +#if FPRINTFTIME +# define add1(C) add (1, fputc (C, p)) +#else +# define add1(C) add (1, *p = C) +#endif + +#if FPRINTFTIME +# define cpy(n, s) \ + add ((n), \ + do \ + { \ + if (to_lowcase) \ + fwrite_lowcase (p, (s), _n); \ + else if (to_uppcase) \ + fwrite_uppcase (p, (s), _n); \ + else \ + { \ + /* We are ignoring the value of fwrite here, in spite of the \ + fact that technically, that may not be valid: the fwrite \ + specification in POSIX 2008 defers to that of fputc, which \ + is intended to be consistent with the one from ISO C, \ + which permits failure due to ENOMEM *without* setting the \ + stream's error indicator. */ \ + ignore_value (fwrite ((s), _n, 1, p)); \ + } \ + } \ + while (0) \ + ) +#else +# define cpy(n, s) \ + add ((n), \ + if (to_lowcase) \ + memcpy_lowcase (p, (s), _n LOCALE_ARG); \ + else if (to_uppcase) \ + memcpy_uppcase (p, (s), _n LOCALE_ARG); \ + else \ + MEMCPY ((void *) p, (void const *) (s), _n)) +#endif + +#ifdef COMPILE_WIDE +# ifndef USE_IN_EXTENDED_LOCALE_MODEL +# undef __mbsrtowcs_l +# define __mbsrtowcs_l(d, s, l, st, loc) __mbsrtowcs (d, s, l, st) +# endif +# define widen(os, ws, l) \ + { \ + mbstate_t __st; \ + const char *__s = os; \ + memset (&__st, '\0', sizeof (__st)); \ + l = __mbsrtowcs_l (NULL, &__s, 0, &__st, loc); \ + ws = (wchar_t *) alloca ((l + 1) * sizeof (wchar_t)); \ + (void) __mbsrtowcs_l (ws, &__s, l, &__st, loc); \ + } +#endif + + +#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL +/* We use this code also for the extended locale handling where the + function gets as an additional argument the locale which has to be + used. To access the values we have to redefine the _NL_CURRENT + macro. */ +# define strftime __strftime_l +# define wcsftime __wcsftime_l +# undef _NL_CURRENT +# define _NL_CURRENT(category, item) \ + (current->values[_NL_ITEM_INDEX (item)].string) +# define LOCALE_ARG , loc +# define LOCALE_PARAM_PROTO , __locale_t loc +# define HELPER_LOCALE_ARG , current +#else +# define LOCALE_PARAM_PROTO +# define LOCALE_ARG +# ifdef _LIBC +# define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME) +# else +# define HELPER_LOCALE_ARG +# endif +#endif + +#ifdef COMPILE_WIDE +# ifdef USE_IN_EXTENDED_LOCALE_MODEL +# define TOUPPER(Ch, L) __towupper_l (Ch, L) +# define TOLOWER(Ch, L) __towlower_l (Ch, L) +# else +# define TOUPPER(Ch, L) towupper (Ch) +# define TOLOWER(Ch, L) towlower (Ch) +# endif +#else +# ifdef USE_IN_EXTENDED_LOCALE_MODEL +# define TOUPPER(Ch, L) __toupper_l (Ch, L) +# define TOLOWER(Ch, L) __tolower_l (Ch, L) +# else +# define TOUPPER(Ch, L) toupper (Ch) +# define TOLOWER(Ch, L) tolower (Ch) +# endif +#endif +/* We don't use `isdigit' here since the locale dependent + interpretation is not what we want here. We only need to accept + the arabic digits in the ASCII range. One day there is perhaps a + more reliable way to accept other sets of digits. */ +#define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9) + +#if FPRINTFTIME +static void +fwrite_lowcase (FILE *fp, const CHAR_T *src, size_t len) +{ + while (len-- > 0) + { + fputc (TOLOWER ((UCHAR_T) *src, loc), fp); + ++src; + } +} + +static void +fwrite_uppcase (FILE *fp, const CHAR_T *src, size_t len) +{ + while (len-- > 0) + { + fputc (TOUPPER ((UCHAR_T) *src, loc), fp); + ++src; + } +} +#else +static CHAR_T * +memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM_PROTO) +{ + while (len-- > 0) + dest[len] = TOLOWER ((UCHAR_T) src[len], loc); + return dest; +} + +static CHAR_T * +memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM_PROTO) +{ + while (len-- > 0) + dest[len] = TOUPPER ((UCHAR_T) src[len], loc); + return dest; +} +#endif + + +#if ! HAVE_TM_GMTOFF +/* Yield the difference between *A and *B, + measured in seconds, ignoring leap seconds. */ +# define tm_diff ftime_tm_diff +static int +tm_diff (const struct tm *a, const struct tm *b) +{ + /* Compute intervening leap days correctly even if year is negative. + Take care to avoid int overflow in leap day calculations, + but it's OK to assume that A and B are close to each other. */ + int a4 = SHR (a->tm_year, 2) + SHR (TM_YEAR_BASE, 2) - ! (a->tm_year & 3); + int b4 = SHR (b->tm_year, 2) + SHR (TM_YEAR_BASE, 2) - ! (b->tm_year & 3); + int a100 = a4 / 25 - (a4 % 25 < 0); + int b100 = b4 / 25 - (b4 % 25 < 0); + int a400 = SHR (a100, 2); + int b400 = SHR (b100, 2); + int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400); + int years = a->tm_year - b->tm_year; + int days = (365 * years + intervening_leap_days + + (a->tm_yday - b->tm_yday)); + return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour)) + + (a->tm_min - b->tm_min)) + + (a->tm_sec - b->tm_sec)); +} +#endif /* ! HAVE_TM_GMTOFF */ + + + +/* The number of days from the first day of the first ISO week of this + year to the year day YDAY with week day WDAY. ISO weeks start on + Monday; the first ISO week has the year's first Thursday. YDAY may + be as small as YDAY_MINIMUM. */ +#define ISO_WEEK_START_WDAY 1 /* Monday */ +#define ISO_WEEK1_WDAY 4 /* Thursday */ +#define YDAY_MINIMUM (-366) +#ifdef __GNUC__ +__inline__ +#endif +static int +iso_week_days (int yday, int wday) +{ + /* Add enough to the first operand of % to make it nonnegative. */ + int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7; + return (yday + - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7 + + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY); +} + + +/* When compiling this file, GNU applications can #define my_strftime + to a symbol (typically nstrftime) to get an extended strftime with + extra arguments UT and NS. Emacs is a special case for now, but + this Emacs-specific code can be removed once Emacs's config.h + defines my_strftime. */ +#if defined emacs && !defined my_strftime +# define my_strftime nstrftime +#endif + +#if FPRINTFTIME +# undef my_strftime +# define my_strftime fprintftime +#endif + +#ifdef my_strftime +# define extra_args , ut, ns +# define extra_args_spec , int ut, int ns +#else +# if defined COMPILE_WIDE +# define my_strftime wcsftime +# define nl_get_alt_digit _nl_get_walt_digit +# else +# define my_strftime strftime +# define nl_get_alt_digit _nl_get_alt_digit +# endif +# define extra_args +# define extra_args_spec +/* We don't have this information in general. */ +# define ut 0 +# define ns 0 +#endif + + +/* Just like my_strftime, below, but with one more parameter, UPCASE, + to indicate that the result should be converted to upper case. */ +static size_t +strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, + STRFTIME_ARG (size_t maxsize) + const CHAR_T *format, + const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO) +{ +#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL + struct locale_data *const current = loc->__locales[LC_TIME]; +#endif +#if FPRINTFTIME + size_t maxsize = (size_t) -1; +#endif + + int hour12 = tp->tm_hour; +#ifdef _NL_CURRENT + /* We cannot make the following values variables since we must delay + the evaluation of these values until really needed since some + expressions might not be valid in every situation. The `struct tm' + might be generated by a strptime() call that initialized + only a few elements. Dereference the pointers only if the format + requires this. Then it is ok to fail if the pointers are invalid. */ +# define a_wkday \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday)) +# define f_wkday \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday)) +# define a_month \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon)) +# define f_month \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)) +# define ampm \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \ + ? NLW(PM_STR) : NLW(AM_STR))) + +# define aw_len STRLEN (a_wkday) +# define am_len STRLEN (a_month) +# define ap_len STRLEN (ampm) +#endif + const char *zone; + size_t i = 0; + STREAM_OR_CHAR_T *p = s; + const CHAR_T *f; +#if DO_MULTIBYTE && !defined COMPILE_WIDE + const char *format_end = NULL; +#endif + +#if ! defined _LIBC && ! HAVE_RUN_TZSET_TEST + /* Solaris 2.5.x and 2.6 tzset sometimes modify the storage returned + by localtime. On such systems, we must either use the tzset and + localtime wrappers to work around the bug (which sets + HAVE_RUN_TZSET_TEST) or make a copy of the structure. */ + struct tm copy = *tp; + tp = © +#endif + + zone = NULL; +#if HAVE_TM_ZONE + /* The POSIX test suite assumes that setting + the environment variable TZ to a new value before calling strftime() + will influence the result (the %Z format) even if the information in + TP is computed with a totally different time zone. + This is bogus: though POSIX allows bad behavior like this, + POSIX does not require it. Do the right thing instead. */ + zone = (const char *) tp->tm_zone; +#endif +#if HAVE_TZNAME + if (ut) + { + if (! (zone && *zone)) + zone = "GMT"; + } + else + { + /* POSIX.1 requires that local time zone information be used as + though strftime called tzset. */ +# if HAVE_TZSET + tzset (); +# endif + } +#endif + + if (hour12 > 12) + hour12 -= 12; + else + if (hour12 == 0) + hour12 = 12; + + for (f = format; *f != '\0'; ++f) + { + int pad = 0; /* Padding for number ('-', '_', or 0). */ + int modifier; /* Field modifier ('E', 'O', or 0). */ + int digits = 0; /* Max digits for numeric format. */ + int number_value; /* Numeric value to be printed. */ + unsigned int u_number_value; /* (unsigned int) number_value. */ + bool negative_number; /* The number is negative. */ + bool always_output_a_sign; /* +/- should always be output. */ + int tz_colon_mask; /* Bitmask of where ':' should appear. */ + const CHAR_T *subfmt; + CHAR_T sign_char; + CHAR_T *bufp; + CHAR_T buf[1 + + 2 /* for the two colons in a %::z or %:::z time zone */ + + (sizeof (int) < sizeof (time_t) + ? INT_STRLEN_BOUND (time_t) + : INT_STRLEN_BOUND (int))]; + int width = -1; + bool to_lowcase = false; + bool to_uppcase = upcase; + size_t colons; + bool change_case = false; + int format_char; + +#if DO_MULTIBYTE && !defined COMPILE_WIDE + switch (*f) + { + case L_('%'): + break; + + case L_('\b'): case L_('\t'): case L_('\n'): + case L_('\v'): case L_('\f'): case L_('\r'): + case L_(' '): case L_('!'): case L_('"'): case L_('#'): case L_('&'): + case L_('\''): case L_('('): case L_(')'): case L_('*'): case L_('+'): + case L_(','): case L_('-'): case L_('.'): case L_('/'): case L_('0'): + case L_('1'): case L_('2'): case L_('3'): case L_('4'): case L_('5'): + case L_('6'): case L_('7'): case L_('8'): case L_('9'): case L_(':'): + case L_(';'): case L_('<'): case L_('='): case L_('>'): case L_('?'): + case L_('A'): case L_('B'): case L_('C'): case L_('D'): case L_('E'): + case L_('F'): case L_('G'): case L_('H'): case L_('I'): case L_('J'): + case L_('K'): case L_('L'): case L_('M'): case L_('N'): case L_('O'): + case L_('P'): case L_('Q'): case L_('R'): case L_('S'): case L_('T'): + case L_('U'): case L_('V'): case L_('W'): case L_('X'): case L_('Y'): + case L_('Z'): case L_('['): case L_('\\'): case L_(']'): case L_('^'): + case L_('_'): case L_('a'): case L_('b'): case L_('c'): case L_('d'): + case L_('e'): case L_('f'): case L_('g'): case L_('h'): case L_('i'): + case L_('j'): case L_('k'): case L_('l'): case L_('m'): case L_('n'): + case L_('o'): case L_('p'): case L_('q'): case L_('r'): case L_('s'): + case L_('t'): case L_('u'): case L_('v'): case L_('w'): case L_('x'): + case L_('y'): case L_('z'): case L_('{'): case L_('|'): case L_('}'): + case L_('~'): + /* The C Standard requires these 98 characters (plus '%') to + be in the basic execution character set. None of these + characters can start a multibyte sequence, so they need + not be analyzed further. */ + add1 (*f); + continue; + + default: + /* Copy this multibyte sequence until we reach its end, find + an error, or come back to the initial shift state. */ + { + mbstate_t mbstate = mbstate_zero; + size_t len = 0; + size_t fsize; + + if (! format_end) + format_end = f + strlen (f) + 1; + fsize = format_end - f; + + do + { + size_t bytes = mbrlen (f + len, fsize - len, &mbstate); + + if (bytes == 0) + break; + + if (bytes == (size_t) -2) + { + len += strlen (f + len); + break; + } + + if (bytes == (size_t) -1) + { + len++; + break; + } + + len += bytes; + } + while (! mbsinit (&mbstate)); + + cpy (len, f); + f += len - 1; + continue; + } + } + +#else /* ! DO_MULTIBYTE */ + + /* Either multibyte encodings are not supported, they are + safe for formats, so any non-'%' byte can be copied through, + or this is the wide character version. */ + if (*f != L_('%')) + { + add1 (*f); + continue; + } + +#endif /* ! DO_MULTIBYTE */ + + /* Check for flags that can modify a format. */ + while (1) + { + switch (*++f) + { + /* This influences the number formats. */ + case L_('_'): + case L_('-'): + case L_('0'): + pad = *f; + continue; + + /* This changes textual output. */ + case L_('^'): + to_uppcase = true; + continue; + case L_('#'): + change_case = true; + continue; + + default: + break; + } + break; + } + + /* As a GNU extension we allow to specify the field width. */ + if (ISDIGIT (*f)) + { + width = 0; + do + { + if (width > INT_MAX / 10 + || (width == INT_MAX / 10 && *f - L_('0') > INT_MAX % 10)) + /* Avoid overflow. */ + width = INT_MAX; + else + { + width *= 10; + width += *f - L_('0'); + } + ++f; + } + while (ISDIGIT (*f)); + } + + /* Check for modifiers. */ + switch (*f) + { + case L_('E'): + case L_('O'): + modifier = *f++; + break; + + default: + modifier = 0; + break; + } + + /* Now do the specified format. */ + format_char = *f; + switch (format_char) + { +#define DO_NUMBER(d, v) \ + digits = d; \ + number_value = v; goto do_number +#define DO_SIGNED_NUMBER(d, negative, v) \ + digits = d; \ + negative_number = negative; \ + u_number_value = v; goto do_signed_number + + /* The mask is not what you might think. + When the ordinal i'th bit is set, insert a colon + before the i'th digit of the time zone representation. */ +#define DO_TZ_OFFSET(d, negative, mask, v) \ + digits = d; \ + negative_number = negative; \ + tz_colon_mask = mask; \ + u_number_value = v; goto do_tz_offset +#define DO_NUMBER_SPACEPAD(d, v) \ + digits = d; \ + number_value = v; goto do_number_spacepad + + case L_('%'): + if (modifier != 0) + goto bad_format; + add1 (*f); + break; + + case L_('a'): + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = true; + to_lowcase = false; + } +#ifdef _NL_CURRENT + cpy (aw_len, a_wkday); + break; +#else + goto underlying_strftime; +#endif + + case 'A': + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = true; + to_lowcase = false; + } +#ifdef _NL_CURRENT + cpy (STRLEN (f_wkday), f_wkday); + break; +#else + goto underlying_strftime; +#endif + + case L_('b'): + case L_('h'): + if (change_case) + { + to_uppcase = true; + to_lowcase = false; + } + if (modifier != 0) + goto bad_format; +#ifdef _NL_CURRENT + cpy (am_len, a_month); + break; +#else + goto underlying_strftime; +#endif + + case L_('B'): + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = true; + to_lowcase = false; + } +#ifdef _NL_CURRENT + cpy (STRLEN (f_month), f_month); + break; +#else + goto underlying_strftime; +#endif + + case L_('c'): + if (modifier == L_('O')) + goto bad_format; +#ifdef _NL_CURRENT + if (! (modifier == 'E' + && (*(subfmt = + (const CHAR_T *) _NL_CURRENT (LC_TIME, + NLW(ERA_D_T_FMT))) + != '\0'))) + subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT)); +#else + goto underlying_strftime; +#endif + + subformat: + { + size_t len = strftime_case_ (to_uppcase, + NULL, STRFTIME_ARG ((size_t) -1) + subfmt, + tp extra_args LOCALE_ARG); + add (len, strftime_case_ (to_uppcase, p, + STRFTIME_ARG (maxsize - i) + subfmt, + tp extra_args LOCALE_ARG)); + } + break; + +#if !(defined _NL_CURRENT && HAVE_STRUCT_ERA_ENTRY) + underlying_strftime: + { + /* The relevant information is available only via the + underlying strftime implementation, so use that. */ + char ufmt[5]; + char *u = ufmt; + char ubuf[1024]; /* enough for any single format in practice */ + size_t len; + /* Make sure we're calling the actual underlying strftime. + In some cases, config.h contains something like + "#define strftime rpl_strftime". */ +# ifdef strftime +# undef strftime + size_t strftime (); +# endif + + /* The space helps distinguish strftime failure from empty + output. */ + *u++ = ' '; + *u++ = '%'; + if (modifier != 0) + *u++ = modifier; + *u++ = format_char; + *u = '\0'; + len = strftime (ubuf, sizeof ubuf, ufmt, tp); + if (len != 0) + cpy (len - 1, ubuf + 1); + } + break; +#endif + + case L_('C'): + if (modifier == L_('O')) + goto bad_format; + if (modifier == L_('E')) + { +#if HAVE_STRUCT_ERA_ENTRY + struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); + if (era) + { +# ifdef COMPILE_WIDE + size_t len = __wcslen (era->era_wname); + cpy (len, era->era_wname); +# else + size_t len = strlen (era->era_name); + cpy (len, era->era_name); +# endif + break; + } +#else + goto underlying_strftime; +#endif + } + + { + int century = tp->tm_year / 100 + TM_YEAR_BASE / 100; + century -= tp->tm_year % 100 < 0 && 0 < century; + DO_SIGNED_NUMBER (2, tp->tm_year < - TM_YEAR_BASE, century); + } + + case L_('x'): + if (modifier == L_('O')) + goto bad_format; +#ifdef _NL_CURRENT + if (! (modifier == L_('E') + && (*(subfmt = + (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT))) + != L_('\0')))) + subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT)); + goto subformat; +#else + goto underlying_strftime; +#endif + case L_('D'): + if (modifier != 0) + goto bad_format; + subfmt = L_("%m/%d/%y"); + goto subformat; + + case L_('d'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, tp->tm_mday); + + case L_('e'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER_SPACEPAD (2, tp->tm_mday); + + /* All numeric formats set DIGITS and NUMBER_VALUE (or U_NUMBER_VALUE) + and then jump to one of these labels. */ + + do_tz_offset: + always_output_a_sign = true; + goto do_number_body; + + do_number_spacepad: + /* Force `_' flag unless overridden by `0' or `-' flag. */ + if (pad != L_('0') && pad != L_('-')) + pad = L_('_'); + + do_number: + /* Format NUMBER_VALUE according to the MODIFIER flag. */ + negative_number = number_value < 0; + u_number_value = number_value; + + do_signed_number: + always_output_a_sign = false; + tz_colon_mask = 0; + + do_number_body: + /* Format U_NUMBER_VALUE according to the MODIFIER flag. + NEGATIVE_NUMBER is nonzero if the original number was + negative; in this case it was converted directly to + unsigned int (i.e., modulo (UINT_MAX + 1)) without + negating it. */ + if (modifier == L_('O') && !negative_number) + { +#ifdef _NL_CURRENT + /* Get the locale specific alternate representation of + the number. If none exist NULL is returned. */ + const CHAR_T *cp = nl_get_alt_digit (u_number_value + HELPER_LOCALE_ARG); + + if (cp != NULL) + { + size_t digitlen = STRLEN (cp); + if (digitlen != 0) + { + cpy (digitlen, cp); + break; + } + } +#else + goto underlying_strftime; +#endif + } + + bufp = buf + sizeof (buf) / sizeof (buf[0]); + + if (negative_number) + u_number_value = - u_number_value; + + do + { + if (tz_colon_mask & 1) + *--bufp = ':'; + tz_colon_mask >>= 1; + *--bufp = u_number_value % 10 + L_('0'); + u_number_value /= 10; + } + while (u_number_value != 0 || tz_colon_mask != 0); + + do_number_sign_and_padding: + if (digits < width) + digits = width; + + sign_char = (negative_number ? L_('-') + : always_output_a_sign ? L_('+') + : 0); + + if (pad == L_('-')) + { + if (sign_char) + add1 (sign_char); + } + else + { + int padding = digits - (buf + (sizeof (buf) / sizeof (buf[0])) + - bufp) - !!sign_char; + + if (padding > 0) + { + if (pad == L_('_')) + { + if ((size_t) padding >= maxsize - i) + return 0; + + if (p) + memset_space (p, padding); + i += padding; + width = width > padding ? width - padding : 0; + if (sign_char) + add1 (sign_char); + } + else + { + if ((size_t) digits >= maxsize - i) + return 0; + + if (sign_char) + add1 (sign_char); + + if (p) + memset_zero (p, padding); + i += padding; + width = 0; + } + } + else + { + if (sign_char) + add1 (sign_char); + } + } + + cpy (buf + sizeof (buf) / sizeof (buf[0]) - bufp, bufp); + break; + + case L_('F'): + if (modifier != 0) + goto bad_format; + subfmt = L_("%Y-%m-%d"); + goto subformat; + + case L_('H'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, tp->tm_hour); + + case L_('I'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, hour12); + + case L_('k'): /* GNU extension. */ + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER_SPACEPAD (2, tp->tm_hour); + + case L_('l'): /* GNU extension. */ + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER_SPACEPAD (2, hour12); + + case L_('j'): + if (modifier == L_('E')) + goto bad_format; + + DO_SIGNED_NUMBER (3, tp->tm_yday < -1, tp->tm_yday + 1U); + + case L_('M'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, tp->tm_min); + + case L_('m'): + if (modifier == L_('E')) + goto bad_format; + + DO_SIGNED_NUMBER (2, tp->tm_mon < -1, tp->tm_mon + 1U); + +#ifndef _LIBC + case L_('N'): /* GNU extension. */ + if (modifier == L_('E')) + goto bad_format; + + number_value = ns; + if (width == -1) + width = 9; + else + { + /* Take an explicit width less than 9 as a precision. */ + int j; + for (j = width; j < 9; j++) + number_value /= 10; + } + + DO_NUMBER (width, number_value); +#endif + + case L_('n'): + add1 (L_('\n')); + break; + + case L_('P'): + to_lowcase = true; +#ifndef _NL_CURRENT + format_char = L_('p'); +#endif + /* FALLTHROUGH */ + + case L_('p'): + if (change_case) + { + to_uppcase = false; + to_lowcase = true; + } +#ifdef _NL_CURRENT + cpy (ap_len, ampm); + break; +#else + goto underlying_strftime; +#endif + + case L_('R'): + subfmt = L_("%H:%M"); + goto subformat; + + case L_('r'): +#ifdef _NL_CURRENT + if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, + NLW(T_FMT_AMPM))) + == L_('\0')) + subfmt = L_("%I:%M:%S %p"); + goto subformat; +#else + goto underlying_strftime; +#endif + + case L_('S'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, tp->tm_sec); + + case L_('s'): /* GNU extension. */ + { + struct tm ltm; + time_t t; + + ltm = *tp; + t = mktime (<m); + + /* Generate string value for T using time_t arithmetic; + this works even if sizeof (long) < sizeof (time_t). */ + + bufp = buf + sizeof (buf) / sizeof (buf[0]); + negative_number = t < 0; + + do + { + int d = t % 10; + t /= 10; + *--bufp = (negative_number ? -d : d) + L_('0'); + } + while (t != 0); + + digits = 1; + always_output_a_sign = false; + goto do_number_sign_and_padding; + } + + case L_('X'): + if (modifier == L_('O')) + goto bad_format; +#ifdef _NL_CURRENT + if (! (modifier == L_('E') + && (*(subfmt = + (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_T_FMT))) + != L_('\0')))) + subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT)); + goto subformat; +#else + goto underlying_strftime; +#endif + case L_('T'): + subfmt = L_("%H:%M:%S"); + goto subformat; + + case L_('t'): + add1 (L_('\t')); + break; + + case L_('u'): + DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1); + + case L_('U'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7); + + case L_('V'): + case L_('g'): + case L_('G'): + if (modifier == L_('E')) + goto bad_format; + { + /* YEAR is a leap year if and only if (tp->tm_year + TM_YEAR_BASE) + is a leap year, except that YEAR and YEAR - 1 both work + correctly even when (tp->tm_year + TM_YEAR_BASE) would + overflow. */ + int year = (tp->tm_year + + (tp->tm_year < 0 + ? TM_YEAR_BASE % 400 + : TM_YEAR_BASE % 400 - 400)); + int year_adjust = 0; + int days = iso_week_days (tp->tm_yday, tp->tm_wday); + + if (days < 0) + { + /* This ISO week belongs to the previous year. */ + year_adjust = -1; + days = iso_week_days (tp->tm_yday + (365 + __isleap (year - 1)), + tp->tm_wday); + } + else + { + int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)), + tp->tm_wday); + if (0 <= d) + { + /* This ISO week belongs to the next year. */ + year_adjust = 1; + days = d; + } + } + + switch (*f) + { + case L_('g'): + { + int yy = (tp->tm_year % 100 + year_adjust) % 100; + DO_NUMBER (2, (0 <= yy + ? yy + : tp->tm_year < -TM_YEAR_BASE - year_adjust + ? -yy + : yy + 100)); + } + + case L_('G'): + DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE - year_adjust, + (tp->tm_year + (unsigned int) TM_YEAR_BASE + + year_adjust)); + + default: + DO_NUMBER (2, days / 7 + 1); + } + } + + case L_('W'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7); + + case L_('w'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (1, tp->tm_wday); + + case L_('Y'): + if (modifier == 'E') + { +#if HAVE_STRUCT_ERA_ENTRY + struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); + if (era) + { +# ifdef COMPILE_WIDE + subfmt = era->era_wformat; +# else + subfmt = era->era_format; +# endif + goto subformat; + } +#else + goto underlying_strftime; +#endif + } + if (modifier == L_('O')) + goto bad_format; + else + DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE, + tp->tm_year + (unsigned int) TM_YEAR_BASE); + + case L_('y'): + if (modifier == L_('E')) + { +#if HAVE_STRUCT_ERA_ENTRY + struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); + if (era) + { + int delta = tp->tm_year - era->start_date[0]; + DO_NUMBER (1, (era->offset + + delta * era->absolute_direction)); + } +#else + goto underlying_strftime; +#endif + } + + { + int yy = tp->tm_year % 100; + if (yy < 0) + yy = tp->tm_year < - TM_YEAR_BASE ? -yy : yy + 100; + DO_NUMBER (2, yy); + } + + case L_('Z'): + if (change_case) + { + to_uppcase = false; + to_lowcase = true; + } + +#if HAVE_TZNAME + /* The tzset() call might have changed the value. */ + if (!(zone && *zone) && tp->tm_isdst >= 0) + zone = tzname[tp->tm_isdst != 0]; +#endif + if (! zone) + zone = ""; + +#ifdef COMPILE_WIDE + { + /* The zone string is always given in multibyte form. We have + to transform it first. */ + wchar_t *wczone; + size_t len; + widen (zone, wczone, len); + cpy (len, wczone); + } +#else + cpy (strlen (zone), zone); +#endif + break; + + case L_(':'): + /* :, ::, and ::: are valid only just before 'z'. + :::: etc. are rejected later. */ + for (colons = 1; f[colons] == L_(':'); colons++) + continue; + if (f[colons] != L_('z')) + goto bad_format; + f += colons; + goto do_z_conversion; + + case L_('z'): + colons = 0; + + do_z_conversion: + if (tp->tm_isdst < 0) + break; + + { + int diff; + int hour_diff; + int min_diff; + int sec_diff; +#if HAVE_TM_GMTOFF + diff = tp->tm_gmtoff; +#else + if (ut) + diff = 0; + else + { + struct tm gtm; + struct tm ltm; + time_t lt; + + ltm = *tp; + lt = mktime (<m); + + if (lt == (time_t) -1) + { + /* mktime returns -1 for errors, but -1 is also a + valid time_t value. Check whether an error really + occurred. */ + struct tm tm; + + if (! __localtime_r (<, &tm) + || ((ltm.tm_sec ^ tm.tm_sec) + | (ltm.tm_min ^ tm.tm_min) + | (ltm.tm_hour ^ tm.tm_hour) + | (ltm.tm_mday ^ tm.tm_mday) + | (ltm.tm_mon ^ tm.tm_mon) + | (ltm.tm_year ^ tm.tm_year))) + break; + } + + if (! __gmtime_r (<, >m)) + break; + + diff = tm_diff (<m, >m); + } +#endif + + hour_diff = diff / 60 / 60; + min_diff = diff / 60 % 60; + sec_diff = diff % 60; + + switch (colons) + { + case 0: /* +hhmm */ + DO_TZ_OFFSET (5, diff < 0, 0, hour_diff * 100 + min_diff); + + case 1: tz_hh_mm: /* +hh:mm */ + DO_TZ_OFFSET (6, diff < 0, 04, hour_diff * 100 + min_diff); + + case 2: tz_hh_mm_ss: /* +hh:mm:ss */ + DO_TZ_OFFSET (9, diff < 0, 024, + hour_diff * 10000 + min_diff * 100 + sec_diff); + + case 3: /* +hh if possible, else +hh:mm, else +hh:mm:ss */ + if (sec_diff != 0) + goto tz_hh_mm_ss; + if (min_diff != 0) + goto tz_hh_mm; + DO_TZ_OFFSET (3, diff < 0, 0, hour_diff); + + default: + goto bad_format; + } + } + + case L_('\0'): /* GNU extension: % at end of format. */ + --f; + /* Fall through. */ + default: + /* Unknown format; output the format, including the '%', + since this is most likely the right thing to do if a + multibyte string has been misparsed. */ + bad_format: + { + int flen; + for (flen = 1; f[1 - flen] != L_('%'); flen++) + continue; + cpy (flen, &f[1 - flen]); + } + break; + } + } + +#if ! FPRINTFTIME + if (p && maxsize != 0) + *p = L_('\0'); +#endif + + return i; +} + +/* Write information from TP into S according to the format + string FORMAT, writing no more that MAXSIZE characters + (including the terminating '\0') and returning number of + characters written. If S is NULL, nothing will be written + anywhere, so to determine how many characters would be + written, use NULL for S and (size_t) -1 for MAXSIZE. */ +size_t +my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) + const CHAR_T *format, + const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO) +{ + return strftime_case_ (false, s, STRFTIME_ARG (maxsize) + format, tp extra_args LOCALE_ARG); +} + +#if defined _LIBC && ! FPRINTFTIME +libc_hidden_def (my_strftime) +#endif + + +#if defined emacs && ! FPRINTFTIME +/* For Emacs we have a separate interface which corresponds to the normal + strftime function plus the ut argument, but without the ns argument. */ +size_t +emacs_strftimeu (char *s, size_t maxsize, const char *format, + const struct tm *tp, int ut) +{ + return my_strftime (s, maxsize, format, tp, ut, 0); +} +#endif === added file 'lib/strftime.h' --- lib/strftime.h 1970-01-01 00:00:00 +0000 +++ lib/strftime.h 2011-01-30 23:34:18 +0000 @@ -0,0 +1,34 @@ +/* declarations for strftime.c + + Copyright (C) 2002, 2004, 2008-2011 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* Just like strftime, but with two more arguments: + POSIX requires that strftime use the local timezone information. + When __UTC is nonzero and tm->tm_zone is NULL or the empty string, + use UTC instead. Use __NS as the number of nanoseconds in the + %N directive. */ +size_t nstrftime (char *, size_t, char const *, struct tm const *, + int __utc, int __ns); + +#ifdef __cplusplus +} +#endif === modified file 'm4/gl-comp.m4' --- m4/gl-comp.m4 2011-01-27 07:24:57 +0000 +++ m4/gl-comp.m4 2011-01-30 23:34:18 +0000 @@ -38,7 +38,9 @@ # Code from module intprops: # Code from module mktime: # Code from module multiarch: + # Code from module stdbool: # Code from module stddef: + # Code from module strftime: # Code from module time: # Code from module time_r: # Code from module unistd: @@ -81,8 +83,12 @@ gl_TIME_MODULE_INDICATOR([mktime]) # Code from module multiarch: gl_MULTIARCH + # Code from module stdbool: + AM_STDBOOL_H # Code from module stddef: gl_STDDEF_H + # Code from module strftime: + gl_FUNC_GNU_STRFTIME # Code from module time: gl_HEADER_TIME_H # Code from module time_r: @@ -245,7 +251,10 @@ lib/intprops.h lib/mktime-internal.h lib/mktime.c + lib/stdbool.in.h lib/stddef.in.h + lib/strftime.c + lib/strftime.h lib/time.in.h lib/time_r.c lib/unistd.in.h @@ -257,9 +266,12 @@ m4/include_next.m4 m4/mktime.m4 m4/multiarch.m4 + m4/stdbool.m4 m4/stddef_h.m4 + m4/strftime.m4 m4/time_h.m4 m4/time_r.m4 + m4/tm_gmtoff.m4 m4/unistd_h.m4 m4/warn-on-use.m4 m4/wchar_t.m4 === added file 'm4/stdbool.m4' --- m4/stdbool.m4 1970-01-01 00:00:00 +0000 +++ m4/stdbool.m4 2011-01-30 23:34:18 +0000 @@ -0,0 +1,103 @@ +# Check for stdbool.h that conforms to C99. + +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +#serial 3 + +# Prepare for substituting if it is not supported. + +AC_DEFUN([AM_STDBOOL_H], +[ + AC_REQUIRE([AC_HEADER_STDBOOL]) + + # Define two additional variables used in the Makefile substitution. + + if test "$ac_cv_header_stdbool_h" = yes; then + STDBOOL_H='' + else + STDBOOL_H='stdbool.h' + fi + AC_SUBST([STDBOOL_H]) + + if test "$ac_cv_type__Bool" = yes; then + HAVE__BOOL=1 + else + HAVE__BOOL=0 + fi + AC_SUBST([HAVE__BOOL]) +]) + +# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future. +AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) + +# This version of the macro is needed in autoconf <= 2.67. Autoconf has +# it built in since 2.60, but we want the tweaks from the 2.68 version +# to avoid rejecting xlc and clang due to relying on extensions. + +AC_DEFUN([AC_HEADER_STDBOOL], + [AC_CACHE_CHECK([for stdbool.h that conforms to C99], + [ac_cv_header_stdbool_h], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ + #include + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; + ]], + [[ + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); + ]])], + [ac_cv_header_stdbool_h=yes], + [ac_cv_header_stdbool_h=no])]) + AC_CHECK_TYPES([_Bool]) + if test $ac_cv_header_stdbool_h = yes; then + AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.]) + fi]) === added file 'm4/strftime.m4' --- m4/strftime.m4 1970-01-01 00:00:00 +0000 +++ m4/strftime.m4 2011-01-30 23:34:18 +0000 @@ -0,0 +1,30 @@ +# serial 32 + +# Copyright (C) 1996-1997, 1999-2007, 2009-2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Written by Jim Meyering and Paul Eggert. + +AC_DEFUN([gl_FUNC_GNU_STRFTIME], +[ + gl_FUNC_STRFTIME +]) + +# These are the prerequisite macros for GNU's strftime.c replacement. +AC_DEFUN([gl_FUNC_STRFTIME], +[ + AC_LIBOBJ([strftime]) + + # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. + AC_REQUIRE([AC_STRUCT_TIMEZONE]) + + AC_REQUIRE([gl_TM_GMTOFF]) + + AC_CHECK_FUNCS_ONCE([tzset]) + + AC_DEFINE([my_strftime], [nstrftime], + [Define to the name of the strftime replacement function.]) +]) === added file 'm4/tm_gmtoff.m4' --- m4/tm_gmtoff.m4 1970-01-01 00:00:00 +0000 +++ m4/tm_gmtoff.m4 2011-01-30 23:34:18 +0000 @@ -0,0 +1,14 @@ +# tm_gmtoff.m4 serial 3 +dnl Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_TM_GMTOFF], +[ + AC_CHECK_MEMBER([struct tm.tm_gmtoff], + [AC_DEFINE([HAVE_TM_GMTOFF], [1], + [Define if struct tm has the tm_gmtoff member.])], + , + [#include ]) +]) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-30 22:22:58 +0000 +++ src/ChangeLog 2011-01-30 23:34:18 +0000 @@ -1,5 +1,15 @@ 2011-01-30 Paul Eggert + strftime: import from gnulib + * Makefile.in (obj): Remove strftime.o, as gnulib now does this for us. + * deps.mk (strftime.o): Remove. + * editfns.c: Include , supplied by gnulib. + (emacs_strftimeu): Remove decl. + (emacs_memftimeu): Use nstrftime (the gnulib name) rather than + emacs_strftimeu. + * config.in: Regenerate. + * strftime.c: Remove; we now use strftime from gnulib. + Use SSDATA when the context wants char *. * alloc.c, buffer.c, bytecode.c, callproc.c, dired.c: * dispnew.c, doc.c, editfns.c, emacs.c, fileio.c, filelock.c: === modified file 'src/Makefile.in' --- src/Makefile.in 2011-01-25 04:08:28 +0000 +++ src/Makefile.in 2011-01-30 23:34:18 +0000 @@ -353,7 +353,7 @@ syntax.o $(UNEXEC_OBJ) bytecode.o \ process.o gnutls.o callproc.o \ region-cache.o sound.o atimer.o \ - doprnt.o strftime.o intervals.o textprop.o composite.o md5.o xml.o \ + doprnt.o intervals.o textprop.o composite.o md5.o xml.o \ $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) ## Object files used on some machine or other. === modified file 'src/config.in' --- src/config.in 2011-01-27 07:24:57 +0000 +++ src/config.in 2011-01-30 23:34:18 +0000 @@ -615,6 +615,9 @@ /* Define to 1 if `speed_t' is declared by . */ #undef HAVE_SPEED_T +/* Define to 1 if stdbool.h conforms to C99. */ +#undef HAVE_STDBOOL_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -630,9 +633,6 @@ /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H @@ -729,7 +729,7 @@ /* Define to 1 if `struct timeval' is declared by . */ #undef HAVE_TIMEVAL -/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */ +/* Define if struct tm has the tm_gmtoff member. */ #undef HAVE_TM_GMTOFF /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use @@ -831,6 +831,9 @@ /* Define to 1 if you want to use the X window system. */ #undef HAVE_X_WINDOWS +/* Define to 1 if the system has the type `_Bool'. */ +#undef HAVE__BOOL + /* Define to 1 if you have the `__builtin_unwind_init' function. */ #undef HAVE___BUILTIN_UNWIND_INIT @@ -1092,6 +1095,9 @@ /* Define to a type if does not define. */ #undef mbstate_t +/* Define to the name of the strftime replacement function. */ +#undef my_strftime + /* Define to `int' if does not define. */ #undef pid_t @@ -1192,8 +1198,6 @@ #endif #endif -#define my_strftime nstrftime /* for strftime.c */ - /* These default definitions are good for almost all machines. The exceptions override them in m/MACHINE.h. */ === modified file 'src/deps.mk' --- src/deps.mk 2011-01-25 04:08:28 +0000 +++ src/deps.mk 2011-01-30 23:34:18 +0000 @@ -168,7 +168,6 @@ $(INTERVALS_H) \ lisp.h $(config_h) sound.o: sound.c dispextern.h syssignal.h lisp.h $(config_h) atimer.h systime.h -strftime.o: strftime.c $(config_h) syntax.o: syntax.c syntax.h buffer.h commands.h category.h character.h \ keymap.h regex.h $(INTERVALS_H) lisp.h $(config_h) sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \ === modified file 'src/editfns.c' --- src/editfns.c 2011-01-30 22:17:44 +0000 +++ src/editfns.c 2011-01-30 23:34:18 +0000 @@ -45,6 +45,7 @@ #endif #include +#include #include "intervals.h" #include "buffer.h" @@ -82,9 +83,6 @@ (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE) #endif -extern size_t emacs_strftimeu (char *, size_t, const char *, - const struct tm *, int); - #ifdef WINDOWSNT extern Lisp_Object w32_get_internal_run_time (void); #endif @@ -1556,8 +1554,8 @@ determine how many bytes would be written, use NULL for S and ((size_t) -1) for MAXSIZE. - This function behaves like emacs_strftimeu, except it allows null - bytes in FORMAT. */ + This function behaves like nstrftime, except it allows null + bytes in FORMAT and it does not support nanoseconds. */ static size_t emacs_memftimeu (char *s, size_t maxsize, const char *format, size_t format_len, const struct tm *tp, int ut) { @@ -1566,7 +1564,7 @@ /* Loop through all the null-terminated strings in the format argument. Normally there's just one null-terminated string, but there can be arbitrarily many, concatenated together, if the - format contains '\0' bytes. emacs_strftimeu stops at the first + format contains '\0' bytes. nstrftime stops at the first '\0' byte so we must invoke it separately for each such string. */ for (;;) { @@ -1576,7 +1574,7 @@ if (s) s[0] = '\1'; - result = emacs_strftimeu (s, maxsize, format, tp, ut); + result = nstrftime (s, maxsize, format, tp, ut, 0); if (s) { === removed file 'src/strftime.c' --- src/strftime.c 2010-11-18 21:39:15 +0000 +++ src/strftime.c 1970-01-01 00:00:00 +0000 @@ -1,1444 +0,0 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with gnulib. - Bugs can be reported to bug-gnulib@gnu.org. - - This file is part of the GNU Emacs. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with the GNU C Library; see the file COPYING. If not, - write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#ifdef _LIBC -# define HAVE_LIMITS_H 1 -# define HAVE_MBLEN 1 -# define HAVE_MBRLEN 1 -# define HAVE_STRUCT_ERA_ENTRY 1 -# define HAVE_TM_GMTOFF 1 -# define HAVE_TM_ZONE 1 -# define HAVE_TZNAME 1 -# define HAVE_TZSET 1 -# define MULTIBYTE_IS_FORMAT_SAFE 1 -# define STDC_HEADERS 1 -# include "../locale/localeinfo.h" -#endif - -#include -#include /* Some systems define `time_t' here. */ - -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif -#if HAVE_TZNAME -#ifndef USE_CRT_DLL -extern char *tzname[]; -#endif -#endif - -/* Do multibyte processing if multibytes are supported, unless - multibyte sequences are safe in formats. Multibyte sequences are - safe if they cannot contain byte sequences that look like format - conversion specifications. The GNU C Library uses UTF8 multibyte - encoding, which is safe for formats, but strftime.c can be used - with other C libraries that use unsafe encodings. */ -#define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE) - -#if DO_MULTIBYTE -# if HAVE_MBRLEN -# include -# ifdef HAVE_SYS__MBSTATE_T_H /* previously tested __hpux */ -# include -# endif -# if !defined (mbsinit) && !defined (HAVE_MBSINIT) -# define mbsinit(ps) 1 -# endif /* !defined (mbsinit) && !defined (HAVE_MBSINIT) */ -# else - /* Simulate mbrlen with mblen as best we can. */ -# define mbstate_t int -# define mbrlen(s, n, ps) mblen (s, n) -# define mbsinit(ps) (*(ps) == 0) -# endif - static const mbstate_t mbstate_zero; -#endif - -#ifdef HAVE_LIMITS_H -# include -#endif - -#ifdef STDC_HEADERS -# include -# include -# include -#else -# ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy ((s), (d), (n)) -# endif -#endif - -#ifdef COMPILE_WIDE -# include -# define CHAR_T wchar_t -# define UCHAR_T unsigned int -# define L_(Str) L##Str -# define NLW(Sym) _NL_W##Sym - -# define MEMCPY(d, s, n) __wmemcpy (d, s, n) -# define STRLEN(s) __wcslen (s) - -#else -# define CHAR_T char -# define UCHAR_T unsigned char -# define L_(Str) Str -# define NLW(Sym) Sym - -# if !defined STDC_HEADERS && !defined HAVE_MEMCPY -# define MEMCPY(d, s, n) bcopy ((s), (d), (n)) -# else -# define MEMCPY(d, s, n) memcpy ((d), (s), (n)) -# endif -# define STRLEN(s) strlen (s) - -# ifdef _LIBC -# define MEMPCPY(d, s, n) __mempcpy (d, s, n) -# else -# ifndef HAVE_MEMPCPY -# define MEMPCPY(d, s, n) ((void *) ((char *) memcpy (d, s, n) + (n))) -# endif -# endif -#endif - -#ifndef PTR -# ifdef __STDC__ -# define PTR void * -# else -# define PTR char * -# endif -#endif - -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif - -#ifndef NULL -# define NULL 0 -#endif - -#define TYPE_SIGNED(t) ((t) -1 < 0) - -/* Bound on length of the string representing an integer value of type t. - Subtract one for the sign bit if t is signed; - 302 / 1000 is log10 (2) rounded up; - add one for integer division truncation; - add one more for a minus sign if t is signed. */ -#define INT_STRLEN_BOUND(t) \ - ((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 1000 + 1 + TYPE_SIGNED (t)) - -#define TM_YEAR_BASE 1900 - -#ifndef __isleap -/* Nonzero if YEAR is a leap year (every 4 years, - except every 100th isn't, and every 400th is). */ -# define __isleap(year) \ - ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) -#endif - - -#ifdef _LIBC -# define my_strftime_gmtime_r __gmtime_r -# define my_strftime_localtime_r __localtime_r -# define tzname __tzname -# define tzset __tzset -#else - -/* If we're a strftime substitute in a GNU program, then prefer gmtime - to gmtime_r, since many gmtime_r implementations are buggy. - Similarly for localtime_r. */ - -# if ! HAVE_TM_GMTOFF -static struct tm * -my_strftime_gmtime_r (const time_t *t, struct tm *tp) -{ - struct tm *l = gmtime (t); - if (! l) - return 0; - *tp = *l; - return tp; -} - -static struct tm * -my_strftime_localtime_r (const time_t *t, struct tm *tp) -{ - struct tm *l = localtime (t); - if (! l) - return 0; - *tp = *l; - return tp; -} -# endif /* ! HAVE_TM_GMTOFF */ -#endif /* ! defined _LIBC */ - - -#if !defined memset && !defined HAVE_MEMSET && !defined _LIBC -/* Some systems lack the `memset' function and we don't want to - introduce additional dependencies. */ -/* The SGI compiler reportedly barfs on the trailing null - if we use a string constant as the initializer. 28 June 1997, rms. */ -static const CHAR_T spaces[16] = /* " " */ -{ - L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '), - L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' ') -}; -static const CHAR_T zeroes[16] = /* "0000000000000000" */ -{ - L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'), - L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0') -}; - -# define memset_space(P, Len) \ - do { \ - int _len = (Len); \ - \ - do \ - { \ - int _this = _len > 16 ? 16 : _len; \ - (P) = MEMPCPY ((P), spaces, _this * sizeof (CHAR_T)); \ - _len -= _this; \ - } \ - while (_len > 0); \ - } while (0) - -# define memset_zero(P, Len) \ - do { \ - int _len = (Len); \ - \ - do \ - { \ - int _this = _len > 16 ? 16 : _len; \ - (P) = MEMPCPY ((P), zeroes, _this * sizeof (CHAR_T)); \ - _len -= _this; \ - } \ - while (_len > 0); \ - } while (0) -#else -# ifdef COMPILE_WIDE -# define memset_space(P, Len) (wmemset ((P), L' ', (Len)), (P) += (Len)) -# define memset_zero(P, Len) (wmemset ((P), L'0', (Len)), (P) += (Len)) -# else -# define memset_space(P, Len) (memset ((P), ' ', (Len)), (P) += (Len)) -# define memset_zero(P, Len) (memset ((P), '0', (Len)), (P) += (Len)) -# endif -#endif - -#define add(n, f) \ - do \ - { \ - int _n = (n); \ - int _delta = width - _n; \ - int _incr = _n + (_delta > 0 ? _delta : 0); \ - if ((size_t) _incr >= maxsize - i) \ - return 0; \ - if (p) \ - { \ - if (_delta > 0) \ - { \ - if (pad == L_('0')) \ - memset_zero (p, _delta); \ - else \ - memset_space (p, _delta); \ - } \ - f; \ - p += _n; \ - } \ - i += _incr; \ - } while (0) - -#define cpy(n, s) \ - add ((n), \ - if (to_lowcase) \ - memcpy_lowcase (p, (s), _n LOCALE_ARG); \ - else if (to_uppcase) \ - memcpy_uppcase (p, (s), _n LOCALE_ARG); \ - else \ - MEMCPY ((PTR) p, (const PTR) (s), _n)) - -#ifdef COMPILE_WIDE -# ifndef USE_IN_EXTENDED_LOCALE_MODEL -# undef __mbsrtowcs_l -# define __mbsrtowcs_l(d, s, l, st, loc) __mbsrtowcs (d, s, l, st) -# endif -# define widen(os, ws, l) \ - { \ - mbstate_t __st; \ - const char *__s = os; \ - memset (&__st, '\0', sizeof (__st)); \ - l = __mbsrtowcs_l (NULL, &__s, 0, &__st, loc); \ - ws = (wchar_t *) alloca ((l + 1) * sizeof (wchar_t)); \ - (void) __mbsrtowcs_l (ws, &__s, l, &__st, loc); \ - } -#endif - - -#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL -/* We use this code also for the extended locale handling where the - function gets as an additional argument the locale which has to be - used. To access the values we have to redefine the _NL_CURRENT - macro. */ -# define strftime __strftime_l -# define wcsftime __wcsftime_l -# undef _NL_CURRENT -# define _NL_CURRENT(category, item) \ - (current->values[_NL_ITEM_INDEX (item)].string) -# define LOCALE_ARG , loc -# define LOCALE_PARAM_DECL , __locale_t loc -# define HELPER_LOCALE_ARG , current -#else -# define LOCALE_ARG -# define LOCALE_PARAM_DECL -# ifdef _LIBC -# define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME) -# else -# define HELPER_LOCALE_ARG -# endif -#endif - -#ifdef COMPILE_WIDE -# ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define TOUPPER(Ch, L) __towupper_l (Ch, L) -# define TOLOWER(Ch, L) __towlower_l (Ch, L) -# else -# define TOUPPER(Ch, L) towupper (Ch) -# define TOLOWER(Ch, L) towlower (Ch) -# endif -#else -# ifdef _LIBC -# ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define TOUPPER(Ch, L) __toupper_l (Ch, L) -# define TOLOWER(Ch, L) __tolower_l (Ch, L) -# else -# define TOUPPER(Ch, L) toupper (Ch) -# define TOLOWER(Ch, L) tolower (Ch) -# endif -# else -# define TOUPPER(Ch, L) (islower (Ch) ? toupper (Ch) : (Ch)) -# define TOLOWER(Ch, L) (isupper (Ch) ? tolower (Ch) : (Ch)) -# endif -#endif -/* We don't use `isdigit' here since the locale dependent - interpretation is not what we want here. We only need to accept - the arabic digits in the ASCII range. One day there is perhaps a - more reliable way to accept other sets of digits. */ -#define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9) - -static CHAR_T * -memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM_DECL) -{ - while (len-- > 0) - dest[len] = TOLOWER ((UCHAR_T) src[len], loc); - return dest; -} - -static CHAR_T * -memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM_DECL) -{ - while (len-- > 0) - dest[len] = TOUPPER ((UCHAR_T) src[len], loc); - return dest; -} - - -#if ! HAVE_TM_GMTOFF -/* Yield the difference between *A and *B, - measured in seconds, ignoring leap seconds. */ -# define tm_diff ftime_tm_diff -static int -tm_diff (const struct tm *a, const struct tm *b) -{ - /* Compute intervening leap days correctly even if year is negative. - Take care to avoid int overflow in leap day calculations, - but it's OK to assume that A and B are close to each other. */ - int a4 = (a->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (a->tm_year & 3); - int b4 = (b->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (b->tm_year & 3); - int a100 = a4 / 25 - (a4 % 25 < 0); - int b100 = b4 / 25 - (b4 % 25 < 0); - int a400 = a100 >> 2; - int b400 = b100 >> 2; - int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400); - int years = a->tm_year - b->tm_year; - int days = (365 * years + intervening_leap_days - + (a->tm_yday - b->tm_yday)); - return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour)) - + (a->tm_min - b->tm_min)) - + (a->tm_sec - b->tm_sec)); -} -#endif /* ! HAVE_TM_GMTOFF */ - - - -/* The number of days from the first day of the first ISO week of this - year to the year day YDAY with week day WDAY. ISO weeks start on - Monday; the first ISO week has the year's first Thursday. YDAY may - be as small as YDAY_MINIMUM. */ -#define ISO_WEEK_START_WDAY 1 /* Monday */ -#define ISO_WEEK1_WDAY 4 /* Thursday */ -#define YDAY_MINIMUM (-366) -static int iso_week_days (int, int); -#ifdef __GNUC__ -__inline__ -#endif -static int -iso_week_days (int yday, int wday) -{ - /* Add enough to the first operand of % to make it nonnegative. */ - int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7; - return (yday - - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7 - + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY); -} - - -#if !(defined _NL_CURRENT || HAVE_STRFTIME) -static CHAR_T const weekday_name[][10] = - { - L_("Sunday"), L_("Monday"), L_("Tuesday"), L_("Wednesday"), - L_("Thursday"), L_("Friday"), L_("Saturday") - }; -static CHAR_T const month_name[][10] = - { - L_("January"), L_("February"), L_("March"), L_("April"), L_("May"), - L_("June"), L_("July"), L_("August"), L_("September"), L_("October"), - L_("November"), L_("December") - }; -#endif - - -/* When compiling this file, GNU applications can #define my_strftime - to a symbol (typically nstrftime) to get an extended strftime with - extra arguments UT and NS. */ - -#ifdef my_strftime -# define extra_args , ut, ns -# define extra_args_spec , int ut, int ns -#else -# ifdef COMPILE_WIDE -# define my_strftime wcsftime -# define nl_get_alt_digit _nl_get_walt_digit -# else -# define my_strftime strftime -# define nl_get_alt_digit _nl_get_alt_digit -# endif -# define extra_args -# define extra_args_spec -/* We don't have this information in general. */ -# define ut 0 -# define ns 0 -#endif - -#if !defined _LIBC && !defined(WINDOWSNT) && HAVE_TZNAME && HAVE_TZSET - /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime. - Work around this bug by copying *tp before it might be munged. */ - size_t - _strftime_copytm (CHAR_T *s, size_t maxsize, const CHAR_T *format, - const struct tm *tp extra_args_spec LOCALE_PARAM_DECL); - size_t - my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format, - const struct tm *tp extra_args_spec) - { - struct tm tmcopy; - tmcopy = *tp; - return _strftime_copytm (s, maxsize, format, &tmcopy extra_args); - } -# undef my_strftime -# define my_strftime _strftime_copytm -#endif - - -/* Write information from TP into S according to the format - string FORMAT, writing no more that MAXSIZE characters - (including the terminating '\0') and returning number of - characters written. If S is NULL, nothing will be written - anywhere, so to determine how many characters would be - written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */ -size_t -my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format, - const struct tm *tp extra_args_spec LOCALE_PARAM_DECL) -{ -#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL - struct locale_data *const current = loc->__locales[LC_TIME]; -#endif - - int hour12 = tp->tm_hour; -#ifdef _NL_CURRENT - /* We cannot make the following values variables since we must delay - the evaluation of these values until really needed since some - expressions might not be valid in every situation. The `struct tm' - might be generated by a strptime() call that initialized - only a few elements. Dereference the pointers only if the format - requires this. Then it is ok to fail if the pointers are invalid. */ -# define a_wkday \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday)) -# define f_wkday \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday)) -# define a_month \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon)) -# define f_month \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)) -# define ampm \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \ - ? NLW(PM_STR) : NLW(AM_STR))) - -# define aw_len STRLEN (a_wkday) -# define am_len STRLEN (a_month) -# define ap_len STRLEN (ampm) -#else -# if !HAVE_STRFTIME -# define f_wkday (weekday_name[tp->tm_wday]) -# define f_month (month_name[tp->tm_mon]) -# define a_wkday f_wkday -# define a_month f_month -# define ampm (L_("AMPM") + 2 * (tp->tm_hour > 11)) - - size_t aw_len = 3; - size_t am_len = 3; - size_t ap_len = 2; -# endif -#endif - const char *zone; - size_t i = 0; - CHAR_T *p = s; - const CHAR_T *f; -#if DO_MULTIBYTE && !defined COMPILE_WIDE - const char *format_end = NULL; -#endif - - zone = NULL; -#if HAVE_TM_ZONE - /* The POSIX test suite assumes that setting - the environment variable TZ to a new value before calling strftime() - will influence the result (the %Z format) even if the information in - TP is computed with a totally different time zone. - This is bogus: though POSIX allows bad behavior like this, - POSIX does not require it. Do the right thing instead. */ - zone = (const char *) tp->tm_zone; -#endif -#if HAVE_TZNAME - if (ut) - { - if (! (zone && *zone)) - zone = "GMT"; - } - else - { - /* POSIX.1 requires that local time zone information be used as - though strftime called tzset. */ -# if HAVE_TZSET - tzset (); -# endif - } -#endif - - if (hour12 > 12) - hour12 -= 12; - else - if (hour12 == 0) - hour12 = 12; - - for (f = format; *f != '\0'; ++f) - { - int pad = 0; /* Padding for number ('-', '_', or 0). */ - int modifier; /* Field modifier ('E', 'O', or 0). */ - int digits; /* Max digits for numeric format. */ - int number_value; /* Numeric value to be printed. */ - int negative_number; /* 1 if the number is negative. */ - const CHAR_T *subfmt; - CHAR_T *bufp; - CHAR_T buf[1 + (sizeof (int) < sizeof (time_t) - ? INT_STRLEN_BOUND (time_t) - : INT_STRLEN_BOUND (int))]; - int width = -1; - int to_lowcase = 0; - int to_uppcase = 0; - int change_case = 0; - int format_char; - -#if DO_MULTIBYTE && !defined COMPILE_WIDE - switch (*f) - { - case L_('%'): - break; - - case L_('\b'): case L_('\t'): case L_('\n'): - case L_('\v'): case L_('\f'): case L_('\r'): - case L_(' '): case L_('!'): case L_('"'): case L_('#'): case L_('&'): - case L_('\''): case L_('('): case L_(')'): case L_('*'): case L_('+'): - case L_(','): case L_('-'): case L_('.'): case L_('/'): case L_('0'): - case L_('1'): case L_('2'): case L_('3'): case L_('4'): case L_('5'): - case L_('6'): case L_('7'): case L_('8'): case L_('9'): case L_(':'): - case L_(';'): case L_('<'): case L_('='): case L_('>'): case L_('?'): - case L_('A'): case L_('B'): case L_('C'): case L_('D'): case L_('E'): - case L_('F'): case L_('G'): case L_('H'): case L_('I'): case L_('J'): - case L_('K'): case L_('L'): case L_('M'): case L_('N'): case L_('O'): - case L_('P'): case L_('Q'): case L_('R'): case L_('S'): case L_('T'): - case L_('U'): case L_('V'): case L_('W'): case L_('X'): case L_('Y'): - case L_('Z'): case L_('['): case L_('\\'): case L_(']'): case L_('^'): - case L_('_'): case L_('a'): case L_('b'): case L_('c'): case L_('d'): - case L_('e'): case L_('f'): case L_('g'): case L_('h'): case L_('i'): - case L_('j'): case L_('k'): case L_('l'): case L_('m'): case L_('n'): - case L_('o'): case L_('p'): case L_('q'): case L_('r'): case L_('s'): - case L_('t'): case L_('u'): case L_('v'): case L_('w'): case L_('x'): - case L_('y'): case L_('z'): case L_('{'): case L_('|'): case L_('}'): - case L_('~'): - /* The C Standard requires these 98 characters (plus '%') to - be in the basic execution character set. None of these - characters can start a multibyte sequence, so they need - not be analyzed further. */ - add (1, *p = *f); - continue; - - default: - /* Copy this multibyte sequence until we reach its end, find - an error, or come back to the initial shift state. */ - { - mbstate_t mbstate = mbstate_zero; - size_t len = 0; - size_t fsize; - - if (! format_end) - format_end = f + strlen (f) + 1; - fsize = format_end - f; - - do - { - size_t bytes = mbrlen (f + len, fsize - len, &mbstate); - - if (bytes == 0) - break; - - if (bytes == (size_t) -2) - { - len += strlen (f + len); - break; - } - - if (bytes == (size_t) -1) - { - len++; - break; - } - - len += bytes; - } - while (! mbsinit (&mbstate)); - - cpy (len, f); - f += len - 1; - continue; - } - } - -#else /* ! DO_MULTIBYTE */ - - /* Either multibyte encodings are not supported, they are - safe for formats, so any non-'%' byte can be copied through, - or this is the wide character version. */ - if (*f != L_('%')) - { - add (1, *p = *f); - continue; - } - -#endif /* ! DO_MULTIBYTE */ - - /* Check for flags that can modify a format. */ - while (1) - { - switch (*++f) - { - /* This influences the number formats. */ - case L_('_'): - case L_('-'): - case L_('0'): - pad = *f; - continue; - - /* This changes textual output. */ - case L_('^'): - to_uppcase = 1; - continue; - case L_('#'): - change_case = 1; - continue; - - default: - break; - } - break; - } - - /* As a GNU extension we allow to specify the field width. */ - if (ISDIGIT (*f)) - { - width = 0; - do - { - if (width > INT_MAX / 10 - || (width == INT_MAX / 10 && *f - L_('0') > INT_MAX % 10)) - /* Avoid overflow. */ - width = INT_MAX; - else - { - width *= 10; - width += *f - L_('0'); - } - ++f; - } - while (ISDIGIT (*f)); - } - - /* Check for modifiers. */ - switch (*f) - { - case L_('E'): - case L_('O'): - modifier = *f++; - break; - - default: - modifier = 0; - break; - } - - /* Now do the specified format. */ - format_char = *f; - switch (format_char) - { -#define DO_NUMBER(d, v) \ - digits = d > width ? d : width; \ - number_value = v; goto do_number -#define DO_NUMBER_SPACEPAD(d, v) \ - digits = d > width ? d : width; \ - number_value = v; goto do_number_spacepad - - case L_('%'): - if (modifier != 0) - goto bad_format; - add (1, *p = *f); - break; - - case L_('a'): - if (modifier != 0) - goto bad_format; - if (change_case) - { - to_uppcase = 1; - to_lowcase = 0; - } -#if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (aw_len, a_wkday); - break; -#else - goto underlying_strftime; -#endif - - case 'A': - if (modifier != 0) - goto bad_format; - if (change_case) - { - to_uppcase = 1; - to_lowcase = 0; - } -#if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (STRLEN (f_wkday), f_wkday); - break; -#else - goto underlying_strftime; -#endif - - case L_('b'): - case L_('h'): - if (change_case) - { - to_uppcase = 1; - to_lowcase = 0; - } - if (modifier != 0) - goto bad_format; -#if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (am_len, a_month); - break; -#else - goto underlying_strftime; -#endif - - case L_('B'): - if (modifier != 0) - goto bad_format; - if (change_case) - { - to_uppcase = 1; - to_lowcase = 0; - } -#if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (STRLEN (f_month), f_month); - break; -#else - goto underlying_strftime; -#endif - - case L_('c'): - if (modifier == L_('O')) - goto bad_format; -#ifdef _NL_CURRENT - if (! (modifier == 'E' - && (*(subfmt = - (const CHAR_T *) _NL_CURRENT (LC_TIME, - NLW(ERA_D_T_FMT))) - != '\0'))) - subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT)); -#else -# if HAVE_STRFTIME - goto underlying_strftime; -# else - subfmt = L_("%a %b %e %H:%M:%S %Y"); -# endif -#endif - - subformat: - { - CHAR_T *old_start = p; - size_t len = my_strftime (NULL, (size_t) -1, subfmt, - tp extra_args LOCALE_ARG); - add (len, my_strftime (p, maxsize - i, subfmt, - tp extra_args LOCALE_ARG)); - - if (to_uppcase) - while (old_start < p) - { - *old_start = TOUPPER ((UCHAR_T) *old_start, loc); - ++old_start; - } - } - break; - -#if HAVE_STRFTIME && ! (defined _NL_CURRENT && HAVE_STRUCT_ERA_ENTRY) - underlying_strftime: - { - /* The relevant information is available only via the - underlying strftime implementation, so use that. */ - char ufmt[4]; - char *u = ufmt; - char ubuf[1024]; /* enough for any single format in practice */ - size_t len; - /* Make sure we're calling the actual underlying strftime. - In some cases, config.h contains something like - "#define strftime rpl_strftime". */ -# ifdef strftime -# undef strftime - size_t strftime (); -# endif - -#ifdef STRFTIME_NO_POSIX2 - /* Some system libraries do not support the POSIX.2 extensions. - In those cases, convert %h to %b, and strip modifiers. */ - modifier = 0; - if (format_char == 'h') - format_char = 'b'; -#endif - *u++ = '%'; - if (modifier != 0) - *u++ = modifier; - *u++ = format_char; - *u = '\0'; - len = strftime (ubuf, sizeof ubuf, ufmt, tp); - if (len == 0 && ubuf[0] != '\0') - return 0; - cpy (len, ubuf); - } - break; -#endif - - case L_('C'): - if (modifier == L_('O')) - goto bad_format; - if (modifier == L_('E')) - { -#if HAVE_STRUCT_ERA_ENTRY - struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); - if (era) - { -# ifdef COMPILE_WIDE - size_t len = __wcslen (era->era_wname); - cpy (len, era->era_wname); -# else - size_t len = strlen (era->era_name); - cpy (len, era->era_name); -# endif - break; - } -#else -# if HAVE_STRFTIME - goto underlying_strftime; -# endif -#endif - } - - { - int year = tp->tm_year + TM_YEAR_BASE; - DO_NUMBER (1, year / 100 - (year % 100 < 0)); - } - - case L_('x'): - if (modifier == L_('O')) - goto bad_format; -#ifdef _NL_CURRENT - if (! (modifier == L_('E') - && (*(subfmt = - (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT))) - != L_('\0')))) - subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT)); - goto subformat; -#else -# if HAVE_STRFTIME - goto underlying_strftime; -# else - /* Fall through. */ -# endif -#endif - case L_('D'): - if (modifier != 0) - goto bad_format; - subfmt = L_("%m/%d/%y"); - goto subformat; - - case L_('d'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (2, tp->tm_mday); - - case L_('e'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER_SPACEPAD (2, tp->tm_mday); - - /* All numeric formats set DIGITS and NUMBER_VALUE and then - jump to one of these two labels. */ - - do_number_spacepad: - /* Force `_' flag unless overridden by `0' or `-' flag. */ - if (pad != L_('0') && pad != L_('-')) - pad = L_('_'); - - do_number: - /* Format the number according to the MODIFIER flag. */ - - if (modifier == L_('O') && 0 <= number_value) - { -#ifdef _NL_CURRENT - /* Get the locale specific alternate representation of - the number NUMBER_VALUE. If none exist NULL is returned. */ - const CHAR_T *cp = nl_get_alt_digit (number_value - HELPER_LOCALE_ARG); - - if (cp != NULL) - { - size_t digitlen = STRLEN (cp); - if (digitlen != 0) - { - cpy (digitlen, cp); - break; - } - } -#else -# if HAVE_STRFTIME - goto underlying_strftime; -# endif -#endif - } - { - unsigned int u = number_value; - - bufp = buf + sizeof (buf) / sizeof (buf[0]); - negative_number = number_value < 0; - - if (negative_number) - u = -u; - - do - *--bufp = u % 10 + L_('0'); - while ((u /= 10) != 0); - } - - do_number_sign_and_padding: - if (negative_number) - *--bufp = L_('-'); - - if (pad != L_('-')) - { - int padding = digits - (buf + (sizeof (buf) / sizeof (buf[0])) - - bufp); - - if (padding > 0) - { - if (pad == L_('_')) - { - if ((size_t) padding >= maxsize - i) - return 0; - - if (p) - memset_space (p, padding); - i += padding; - width = width > padding ? width - padding : 0; - } - else - { - if ((size_t) digits >= maxsize - i) - return 0; - - if (negative_number) - { - ++bufp; - - if (p) - *p++ = L_('-'); - ++i; - } - - if (p) - memset_zero (p, padding); - i += padding; - width = 0; - } - } - } - - cpy (buf + sizeof (buf) / sizeof (buf[0]) - bufp, bufp); - break; - - case L_('F'): - if (modifier != 0) - goto bad_format; - subfmt = L_("%Y-%m-%d"); - goto subformat; - - case L_('H'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (2, tp->tm_hour); - - case L_('I'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (2, hour12); - - case L_('k'): /* GNU extension. */ - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER_SPACEPAD (2, tp->tm_hour); - - case L_('l'): /* GNU extension. */ - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER_SPACEPAD (2, hour12); - - case L_('j'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (3, 1 + tp->tm_yday); - - case L_('M'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (2, tp->tm_min); - - case L_('m'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (2, tp->tm_mon + 1); - -#ifndef _LIBC - case L_('N'): /* GNU extension. */ - if (modifier == L_('E')) - goto bad_format; - - number_value = ns; - if (width != -1) - { - /* Take an explicit width less than 9 as a precision. */ - int j; - for (j = width; j < 9; j++) - number_value /= 10; - } - - DO_NUMBER (9, number_value); -#endif - - case L_('n'): - add (1, *p = L_('\n')); - break; - - case L_('P'): - to_lowcase = 1; -#if !defined _NL_CURRENT && HAVE_STRFTIME - format_char = L_('p'); -#endif - /* FALLTHROUGH */ - - case L_('p'): - if (change_case) - { - to_uppcase = 0; - to_lowcase = 1; - } -#if defined _NL_CURRENT || !HAVE_STRFTIME - cpy (ap_len, ampm); - break; -#else - goto underlying_strftime; -#endif - - case L_('R'): - subfmt = L_("%H:%M"); - goto subformat; - - case L_('r'): -#ifdef _NL_CURRENT - if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, - NLW(T_FMT_AMPM))) - == L_('\0')) -#endif - subfmt = L_("%I:%M:%S %p"); - goto subformat; - - case L_('S'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (2, tp->tm_sec); - - case L_('s'): /* GNU extension. */ - { - struct tm ltm; - time_t t; - - ltm = *tp; - t = mktime (<m); - - /* Generate string value for T using time_t arithmetic; - this works even if sizeof (long) < sizeof (time_t). */ - - bufp = buf + sizeof (buf) / sizeof (buf[0]); - negative_number = t < 0; - - do - { - int d = t % 10; - t /= 10; - - if (negative_number) - { - d = -d; - - /* Adjust if division truncates to minus infinity. */ - if (0 < -1 % 10 && d < 0) - { - t++; - d += 10; - } - } - - *--bufp = d + L_('0'); - } - while (t != 0); - - digits = 1; - goto do_number_sign_and_padding; - } - - case L_('X'): - if (modifier == L_('O')) - goto bad_format; -#ifdef _NL_CURRENT - if (! (modifier == L_('E') - && (*(subfmt = - (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_T_FMT))) - != L_('\0')))) - subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT)); - goto subformat; -#else -# if HAVE_STRFTIME - goto underlying_strftime; -# else - /* Fall through. */ -# endif -#endif - case L_('T'): - subfmt = L_("%H:%M:%S"); - goto subformat; - - case L_('t'): - add (1, *p = L_('\t')); - break; - - case L_('u'): - DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1); - - case L_('U'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7); - - case L_('V'): - case L_('g'): - case L_('G'): - if (modifier == L_('E')) - goto bad_format; - { - int year = tp->tm_year + TM_YEAR_BASE; - int days = iso_week_days (tp->tm_yday, tp->tm_wday); - - if (days < 0) - { - /* This ISO week belongs to the previous year. */ - year--; - days = iso_week_days (tp->tm_yday + (365 + __isleap (year)), - tp->tm_wday); - } - else - { - int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)), - tp->tm_wday); - if (0 <= d) - { - /* This ISO week belongs to the next year. */ - year++; - days = d; - } - } - - switch (*f) - { - case L_('g'): - DO_NUMBER (2, (year % 100 + 100) % 100); - - case L_('G'): - DO_NUMBER (1, year); - - default: - DO_NUMBER (2, days / 7 + 1); - } - } - - case L_('W'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7); - - case L_('w'): - if (modifier == L_('E')) - goto bad_format; - - DO_NUMBER (1, tp->tm_wday); - - case L_('Y'): - if (modifier == 'E') - { -#if HAVE_STRUCT_ERA_ENTRY - struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); - if (era) - { -# ifdef COMPILE_WIDE - subfmt = era->era_wformat; -# else - subfmt = era->era_format; -# endif - goto subformat; - } -#else -# if HAVE_STRFTIME - goto underlying_strftime; -# endif -#endif - } - if (modifier == L_('O')) - goto bad_format; - else - DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE); - - case L_('y'): - if (modifier == L_('E')) - { -#if HAVE_STRUCT_ERA_ENTRY - struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); - if (era) - { - int delta = tp->tm_year - era->start_date[0]; - DO_NUMBER (1, (era->offset - + delta * era->absolute_direction)); - } -#else -# if HAVE_STRFTIME - goto underlying_strftime; -# endif -#endif - } - DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100); - - case L_('Z'): - if (change_case) - { - to_uppcase = 0; - to_lowcase = 1; - } - -#if HAVE_TZNAME - /* The tzset() call might have changed the value. */ - if (!(zone && *zone) && tp->tm_isdst >= 0) - zone = tzname[tp->tm_isdst]; -#endif - if (! zone) - zone = ""; - -#ifdef COMPILE_WIDE - { - /* The zone string is always given in multibyte form. We have - to transform it first. */ - wchar_t *wczone; - size_t len; - widen (zone, wczone, len); - cpy (len, wczone); - } -#else - cpy (strlen (zone), zone); -#endif - break; - - case L_('z'): - if (tp->tm_isdst < 0) - break; - - { - int diff; -#if HAVE_TM_GMTOFF - diff = tp->tm_gmtoff; -#else - if (ut) - diff = 0; - else - { - struct tm gtm; - struct tm ltm; - time_t lt; - - ltm = *tp; - lt = mktime (<m); - - if (lt == (time_t) -1) - { - /* mktime returns -1 for errors, but -1 is also a - valid time_t value. Check whether an error really - occurred. */ - struct tm tm; - - if (! my_strftime_localtime_r (<, &tm) - || ((ltm.tm_sec ^ tm.tm_sec) - | (ltm.tm_min ^ tm.tm_min) - | (ltm.tm_hour ^ tm.tm_hour) - | (ltm.tm_mday ^ tm.tm_mday) - | (ltm.tm_mon ^ tm.tm_mon) - | (ltm.tm_year ^ tm.tm_year))) - break; - } - - if (! my_strftime_gmtime_r (<, >m)) - break; - - diff = tm_diff (<m, >m); - } -#endif - - if (diff < 0) - { - add (1, *p = L_('-')); - diff = -diff; - } - else - add (1, *p = L_('+')); - - diff /= 60; - DO_NUMBER (4, (diff / 60) * 100 + diff % 60); - } - - case L_('\0'): /* GNU extension: % at end of format. */ - --f; - /* Fall through. */ - default: - /* Unknown format; output the format, including the '%', - since this is most likely the right thing to do if a - multibyte string has been misparsed. */ - bad_format: - { - int flen; - for (flen = 1; f[1 - flen] != L_('%'); flen++) - continue; - cpy (flen, &f[1 - flen]); - } - break; - } - } - - if (p && maxsize != 0) - *p = L_('\0'); - return i; -} -#ifdef _LIBC -libc_hidden_def (my_strftime) -#endif - - -#ifdef emacs -#undef ut -/* For Emacs we have a separate interface which corresponds to the normal - strftime function plus the ut argument, but without the ns argument. */ -size_t -emacs_strftimeu (char *s, size_t maxsize, const char *format, - const struct tm *tp, int ut) -{ - return my_strftime (s, maxsize, format, tp, ut, 0); -} -#endif - ------------------------------------------------------------ revno: 103036 [merge] committer: Paul Eggert branch nick: trunk timestamp: Sun 2011-01-30 14:22:58 -0800 message: Use SSDATA when the context wants char *. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-30 18:36:12 +0000 +++ src/ChangeLog 2011-01-30 22:22:58 +0000 @@ -1,3 +1,14 @@ +2011-01-30 Paul Eggert + + Use SSDATA when the context wants char *. + * alloc.c, buffer.c, bytecode.c, callproc.c, dired.c: + * dispnew.c, doc.c, editfns.c, emacs.c, fileio.c, filelock.c: + * fns.c, font.c, frame.c, image.c, indent.c, keyboard.c: + * lread.c, minibuf.c, print.c, process.c, search.c, widget.c: + * xdisp.c, xfaces.c, xfns.c, xml.c, xselect.c, xterm.c: + Use SSDATA (not SDATA) when the context of the expression wants + char * (not unsigned char *). + 2011-01-30 Jan Djärv * .gdbinit: Read global lisp variables as globals.f_V*. === modified file 'src/alloc.c' --- src/alloc.c 2011-01-25 04:08:28 +0000 +++ src/alloc.c 2011-01-30 22:17:44 +0000 @@ -4756,7 +4756,7 @@ else if (FLOATP (obj)) obj = make_pure_float (XFLOAT_DATA (obj)); else if (STRINGP (obj)) - obj = make_pure_string (SDATA (obj), SCHARS (obj), + obj = make_pure_string (SSDATA (obj), SCHARS (obj), SBYTES (obj), STRING_MULTIBYTE (obj)); else if (COMPILEDP (obj) || VECTORP (obj)) @@ -6276,4 +6276,3 @@ defsubr (&Sgc_status); #endif } - === modified file 'src/buffer.c' --- src/buffer.c 2011-01-25 04:08:28 +0000 +++ src/buffer.c 2011-01-30 22:17:44 +0000 @@ -1638,7 +1638,7 @@ CHECK_BUFFER (buffer); if (STRINGP (XBUFFER (buffer)->name) - && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0) + && strcmp (SSDATA (XBUFFER (buffer)->name), "*scratch*") == 0) function = find_symbol_value (intern ("initial-major-mode")); else { @@ -5229,7 +5229,7 @@ because of the ange-ftp completion handler. However, it is not necessary to turn / into /:/. So avoid doing that. */ - && strcmp ("/", SDATA (current_buffer->directory))) + && strcmp ("/", SSDATA (current_buffer->directory))) current_buffer->directory = concat2 (build_string ("/:"), current_buffer->directory); @@ -6208,4 +6208,3 @@ initialized when that function gets called. */ Fput (intern_c_string ("erase-buffer"), Qdisabled, Qt); } - === modified file 'src/bytecode.c' --- src/bytecode.c 2011-01-25 04:08:28 +0000 +++ src/bytecode.c 2011-01-30 22:17:44 +0000 @@ -871,7 +871,7 @@ case Btemp_output_buffer_setup: BEFORE_POTENTIAL_GC (); CHECK_STRING (TOP); - temp_output_buffer_setup (SDATA (TOP)); + temp_output_buffer_setup (SSDATA (TOP)); AFTER_POTENTIAL_GC (); TOP = Vstandard_output; break; @@ -1709,4 +1709,3 @@ } #endif } - === modified file 'src/callproc.c' --- src/callproc.c 2011-01-25 04:08:28 +0000 +++ src/callproc.c 2011-01-30 22:17:44 +0000 @@ -349,7 +349,7 @@ display_p = INTERACTIVE && nargs >= 4 && !NILP (args[3]); - filefd = emacs_open (SDATA (infile), O_RDONLY, 0); + filefd = emacs_open (SSDATA (infile), O_RDONLY, 0); if (filefd < 0) { infile = DECODE_FILE (infile); @@ -465,11 +465,11 @@ else if (STRINGP (error_file)) { #ifdef DOS_NT - fd_error = emacs_open (SDATA (error_file), + fd_error = emacs_open (SSDATA (error_file), O_WRONLY | O_TRUNC | O_CREAT | O_TEXT, S_IREAD | S_IWRITE); #else /* not DOS_NT */ - fd_error = creat (SDATA (error_file), 0666); + fd_error = creat (SSDATA (error_file), 0666); #endif /* not DOS_NT */ } @@ -1079,7 +1079,7 @@ CONSP (tem) && STRINGP (XCAR (tem)); tem = XCDR (tem)) { - if (strncmp (SDATA (XCAR (tem)), "DISPLAY", 7) == 0 + if (strncmp (SSDATA (XCAR (tem)), "DISPLAY", 7) == 0 && (SDATA (XCAR (tem)) [7] == '\0' || SDATA (XCAR (tem)) [7] == '=')) /* DISPLAY is specified in process-environment. */ @@ -1111,10 +1111,10 @@ if (STRINGP (display)) { - int vlen = strlen ("DISPLAY=") + strlen (SDATA (display)) + 1; + int vlen = strlen ("DISPLAY=") + strlen (SSDATA (display)) + 1; char *vdata = (char *) alloca (vlen); strcpy (vdata, "DISPLAY="); - strcat (vdata, SDATA (display)); + strcat (vdata, SSDATA (display)); new_env = add_env (env, new_env, vdata); } @@ -1122,7 +1122,7 @@ for (tem = Vprocess_environment; CONSP (tem) && STRINGP (XCAR (tem)); tem = XCDR (tem)) - new_env = add_env (env, new_env, SDATA (XCAR (tem))); + new_env = add_env (env, new_env, SSDATA (XCAR (tem))); *new_env = 0; @@ -1340,13 +1340,13 @@ CHECK_STRING (variable); if (CONSP (env)) { - if (getenv_internal_1 (SDATA (variable), SBYTES (variable), + if (getenv_internal_1 (SSDATA (variable), SBYTES (variable), &value, &valuelen, env)) return value ? make_string (value, valuelen) : Qt; else return Qnil; } - else if (getenv_internal (SDATA (variable), SBYTES (variable), + else if (getenv_internal (SSDATA (variable), SBYTES (variable), &value, &valuelen, env)) return make_string (value, valuelen); else @@ -1459,13 +1459,13 @@ #endif { tempdir = Fdirectory_file_name (Vexec_directory); - if (access (SDATA (tempdir), 0) < 0) + if (access (SSDATA (tempdir), 0) < 0) dir_warning ("Warning: arch-dependent data dir (%s) does not exist.\n", Vexec_directory); } tempdir = Fdirectory_file_name (Vdata_directory); - if (access (SDATA (tempdir), 0) < 0) + if (access (SSDATA (tempdir), 0) < 0) dir_warning ("Warning: arch-independent data dir (%s) does not exist.\n", Vdata_directory); === modified file 'src/dired.c' --- src/dired.c 2011-01-25 04:08:28 +0000 +++ src/dired.c 2011-01-30 22:17:44 +0000 @@ -176,7 +176,7 @@ which might compile a new regexp until we're done with the loop! */ BLOCK_INPUT; - d = opendir (SDATA (dirfilename)); + d = opendir (SSDATA (dirfilename)); UNBLOCK_INPUT; if (d == NULL) report_file_error ("Opening directory", Fcons (directory, Qnil)); @@ -258,7 +258,7 @@ QUIT; if (NILP (match) - || (0 <= re_search (bufp, SDATA (name), len, 0, len, 0))) + || (0 <= re_search (bufp, SSDATA (name), len, 0, len, 0))) wanted = 1; immediate_quit = 0; @@ -498,7 +498,7 @@ encoded_dir = ENCODE_FILE (dirname); BLOCK_INPUT; - d = opendir (SDATA (Fdirectory_file_name (encoded_dir))); + d = opendir (SSDATA (Fdirectory_file_name (encoded_dir))); UNBLOCK_INPUT; if (!d) report_file_error ("Opening directory", Fcons (dirname, Qnil)); @@ -970,7 +970,7 @@ encoded = ENCODE_FILE (filename); UNGCPRO; - if (lstat (SDATA (encoded), &s) < 0) + if (lstat (SSDATA (encoded), &s) < 0) return Qnil; switch (s.st_mode & S_IFMT) @@ -1099,4 +1099,3 @@ ends in a slash. */); Vcompletion_ignored_extensions = Qnil; } - === modified file 'src/dispnew.c' --- src/dispnew.c 2011-01-25 04:08:28 +0000 +++ src/dispnew.c 2011-01-30 22:17:44 +0000 @@ -5849,7 +5849,7 @@ if (! NILP (file)) { file = Fexpand_file_name (file, Qnil); - tty->termscript = fopen (SDATA (file), "w"); + tty->termscript = fopen (SSDATA (file), "w"); if (tty->termscript == 0) report_file_error ("Opening termscript", Fcons (file, Qnil)); } === modified file 'src/doc.c' --- src/doc.c 2011-01-25 04:08:28 +0000 +++ src/doc.c 2011-01-30 22:17:44 +0000 @@ -120,8 +120,8 @@ if (minsize < 8) minsize = 8; name = (char *) alloca (minsize + SCHARS (file) + 8); - strcpy (name, SDATA (Vdoc_directory)); - strcat (name, SDATA (file)); + strcpy (name, SSDATA (Vdoc_directory)); + strcat (name, SSDATA (file)); } else { @@ -137,7 +137,7 @@ /* Preparing to dump; DOC file is probably not installed. So check in ../etc. */ strcpy (name, "../etc/"); - strcat (name, SDATA (file)); + strcat (name, SSDATA (file)); fd = emacs_open (name, O_RDONLY, 0); } @@ -559,9 +559,9 @@ CHECK_STRING (Vdoc_directory); name = (char *) alloca (SCHARS (filename) + SCHARS (Vdoc_directory) + 1); - strcpy (name, SDATA (Vdoc_directory)); + strcpy (name, SSDATA (Vdoc_directory)); } - strcat (name, SDATA (filename)); /*** Add this line ***/ + strcat (name, SSDATA (filename)); /*** Add this line ***/ /* Vbuild_files is nil when temacs is run, and non-nil after that. */ if (NILP (Vbuild_files)) === modified file 'src/editfns.c' --- src/editfns.c 2011-01-25 04:08:28 +0000 +++ src/editfns.c 2011-01-30 22:17:44 +0000 @@ -1345,7 +1345,7 @@ else if (STRINGP (uid)) { BLOCK_INPUT; - pw = (struct passwd *) getpwnam (SDATA (uid)); + pw = (struct passwd *) getpwnam (SSDATA (uid)); UNBLOCK_INPUT; } else @@ -1372,7 +1372,7 @@ r = (unsigned char *) alloca (strlen (p) + SCHARS (login) + 1); memcpy (r, p, q - p); r[q - p] = 0; - strcat (r, SDATA (login)); + strcat (r, SSDATA (login)); r[q - p] = UPCASE (r[q - p]); strcat (r, q + 1); full = build_string (r); @@ -1680,7 +1680,7 @@ buf[0] = '\1'; BLOCK_INPUT; - result = emacs_memftimeu (buf, size, SDATA (format_string), + result = emacs_memftimeu (buf, size, SSDATA (format_string), SBYTES (format_string), tm, ut); UNBLOCK_INPUT; @@ -1691,7 +1691,7 @@ /* If buffer was too small, make it bigger and try again. */ BLOCK_INPUT; result = emacs_memftimeu (NULL, (size_t) -1, - SDATA (format_string), + SSDATA (format_string), SBYTES (format_string), tm, ut); UNBLOCK_INPUT; === modified file 'src/emacs.c' --- src/emacs.c 2011-01-25 04:08:28 +0000 +++ src/emacs.c 2011-01-30 22:17:44 +0000 @@ -755,8 +755,8 @@ } else { - version = SDATA (tem); - copyright = SDATA (tem2); + version = SSDATA (tem); + copyright = SSDATA (tem2); } } else @@ -1988,7 +1988,7 @@ kill it because we are exiting Emacs deliberately (not crashing). Do it after shut_down_emacs, which does an auto-save. */ if (STRINGP (Vauto_save_list_file_name)) - unlink (SDATA (Vauto_save_list_file_name)); + unlink (SSDATA (Vauto_save_list_file_name)); exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS); } @@ -2169,7 +2169,7 @@ #ifdef USE_MMAP_FOR_BUFFERS mmap_set_vars (0); #endif - unexec (SDATA (filename), !NILP (symfile) ? SDATA (symfile) : 0); + unexec (SSDATA (filename), !NILP (symfile) ? SSDATA (symfile) : 0); #ifdef USE_MMAP_FOR_BUFFERS mmap_set_vars (1); #endif === modified file 'src/fileio.c' --- src/fileio.c 2011-01-25 04:08:28 +0000 +++ src/fileio.c 2011-01-30 22:17:44 +0000 @@ -500,7 +500,7 @@ return call2 (handler, Qfile_name_as_directory, file); buf = (char *) alloca (SBYTES (file) + 10); - file_name_as_directory (buf, SDATA (file)); + file_name_as_directory (buf, SSDATA (file)); return make_specified_string (buf, -1, strlen (buf), STRING_MULTIBYTE (file)); } @@ -559,7 +559,7 @@ return call2 (handler, Qdirectory_file_name, directory); buf = (char *) alloca (SBYTES (directory) + 20); - directory_file_name (SDATA (directory), buf); + directory_file_name (SSDATA (directory), buf); return make_specified_string (buf, -1, strlen (buf), STRING_MULTIBYTE (directory)); } @@ -935,7 +935,7 @@ #ifdef WINDOWSNT if (IS_DIRECTORY_SEP (nm[1])) { - if (strcmp (nm, SDATA (name)) != 0) + if (strcmp (nm, SSDATA (name)) != 0) name = make_specified_string (nm, -1, strlen (nm), multibyte); } else @@ -951,7 +951,7 @@ } return name; #else /* not DOS_NT */ - if (strcmp (nm, SDATA (name)) == 0) + if (strcmp (nm, SSDATA (name)) == 0) return name; return make_specified_string (nm, -1, strlen (nm), multibyte); #endif /* not DOS_NT */ @@ -1685,13 +1685,13 @@ orig = make_unibyte_string (o, orig_length); decoded = DECODE_FILE (orig); decoded_length = SBYTES (decoded); - strncpy (x, SDATA (decoded), decoded_length); + strncpy (x, SSDATA (decoded), decoded_length); x += decoded_length; /* If environment variable needed decoding, return value needs to be multibyte. */ if (decoded_length != orig_length - || strncmp (SDATA (decoded), o, orig_length)) + || strncmp (SSDATA (decoded), o, orig_length)) multibyte = 1; } } @@ -1761,7 +1761,7 @@ /* stat is a good way to tell whether the file exists, regardless of what access permissions it has. */ - if (lstat (SDATA (encoded_filename), &statbuf) >= 0) + if (lstat (SSDATA (encoded_filename), &statbuf) >= 0) { if (! interactive) xsignal2 (Qfile_already_exists, @@ -1859,7 +1859,7 @@ || INTEGERP (ok_if_already_exists)) barf_or_query_if_file_exists (newname, "copy to it", INTEGERP (ok_if_already_exists), &out_st, 0); - else if (stat (SDATA (encoded_newname), &out_st) < 0) + else if (stat (SSDATA (encoded_newname), &out_st) < 0) out_st.st_mode = 0; #ifdef WINDOWSNT @@ -1892,7 +1892,7 @@ } #else /* not WINDOWSNT */ immediate_quit = 1; - ifd = emacs_open (SDATA (encoded_file), O_RDONLY, 0); + ifd = emacs_open (SSDATA (encoded_file), O_RDONLY, 0); immediate_quit = 0; if (ifd < 0) @@ -1942,7 +1942,7 @@ | (NILP (ok_if_already_exists) ? O_EXCL : 0), S_IREAD | S_IWRITE); #else /* not MSDOS */ - ofd = emacs_open (SDATA (encoded_newname), + ofd = emacs_open (SSDATA (encoded_newname), O_WRONLY | O_TRUNC | O_CREAT | (NILP (ok_if_already_exists) ? O_EXCL : 0), 0666); @@ -1993,7 +1993,7 @@ EMACS_TIME atime, mtime; EMACS_SET_SECS_USECS (atime, st.st_atime, 0); EMACS_SET_SECS_USECS (mtime, st.st_mtime, 0); - if (set_file_times (SDATA (encoded_newname), + if (set_file_times (SSDATA (encoded_newname), atime, mtime)) xsignal2 (Qfile_date_error, build_string ("Cannot set file date"), newname); @@ -2109,7 +2109,7 @@ encoded_file = ENCODE_FILE (filename); - if (0 > unlink (SDATA (encoded_file))) + if (0 > unlink (SSDATA (encoded_file))) report_file_error ("Removing old name", list1 (filename)); return Qnil; } @@ -2190,7 +2190,7 @@ || INTEGERP (ok_if_already_exists)) barf_or_query_if_file_exists (newname, "rename to it", INTEGERP (ok_if_already_exists), 0, 0); - if (0 > rename (SDATA (encoded_file), SDATA (encoded_newname))) + if (0 > rename (SSDATA (encoded_file), SSDATA (encoded_newname))) { if (errno == EXDEV) { @@ -2277,8 +2277,8 @@ barf_or_query_if_file_exists (newname, "make it a new name", INTEGERP (ok_if_already_exists), 0, 0); - unlink (SDATA (newname)); - if (0 > link (SDATA (encoded_file), SDATA (encoded_newname))) + unlink (SSDATA (newname)); + if (0 > link (SSDATA (encoded_file), SSDATA (encoded_newname))) report_file_error ("Adding new name", list2 (file, newname)); UNGCPRO; @@ -2336,15 +2336,15 @@ || INTEGERP (ok_if_already_exists)) barf_or_query_if_file_exists (linkname, "make it a link", INTEGERP (ok_if_already_exists), 0, 0); - if (0 > symlink (SDATA (encoded_filename), - SDATA (encoded_linkname))) + if (0 > symlink (SSDATA (encoded_filename), + SSDATA (encoded_linkname))) { /* If we didn't complain already, silently delete existing file. */ if (errno == EEXIST) { - unlink (SDATA (encoded_linkname)); - if (0 <= symlink (SDATA (encoded_filename), - SDATA (encoded_linkname))) + unlink (SSDATA (encoded_linkname)); + if (0 <= symlink (SSDATA (encoded_filename), + SSDATA (encoded_linkname))) { UNGCPRO; return Qnil; @@ -2444,7 +2444,7 @@ absname = ENCODE_FILE (absname); - return (stat (SDATA (absname), &statbuf) >= 0) ? Qt : Qnil; + return (stat (SSDATA (absname), &statbuf) >= 0) ? Qt : Qnil; } DEFUN ("file-executable-p", Ffile_executable_p, Sfile_executable_p, 1, 1, 0, @@ -2466,7 +2466,7 @@ absname = ENCODE_FILE (absname); - return (check_executable (SDATA (absname)) ? Qt : Qnil); + return (check_executable (SSDATA (absname)) ? Qt : Qnil); } DEFUN ("file-readable-p", Ffile_readable_p, Sfile_readable_p, 1, 1, 0, @@ -2503,13 +2503,13 @@ /* Opening a fifo without O_NONBLOCK can wait. We don't want to wait. But we don't want to mess wth O_NONBLOCK except in the case of a fifo, on a system which handles it. */ - desc = stat (SDATA (absname), &statbuf); + desc = stat (SSDATA (absname), &statbuf); if (desc < 0) return Qnil; if (S_ISFIFO (statbuf.st_mode)) flags |= O_NONBLOCK; #endif - desc = emacs_open (SDATA (absname), flags, 0); + desc = emacs_open (SSDATA (absname), flags, 0); if (desc < 0) return Qnil; emacs_close (desc); @@ -2537,8 +2537,8 @@ return call2 (handler, Qfile_writable_p, absname); encoded = ENCODE_FILE (absname); - if (stat (SDATA (encoded), &statbuf) >= 0) - return (check_writable (SDATA (encoded)) + if (stat (SSDATA (encoded), &statbuf) >= 0) + return (check_writable (SSDATA (encoded)) ? Qt : Qnil); dir = Ffile_name_directory (absname); @@ -2583,9 +2583,9 @@ encoded_filename = ENCODE_FILE (absname); - fd = emacs_open (SDATA (encoded_filename), O_RDONLY, 0); + fd = emacs_open (SSDATA (encoded_filename), O_RDONLY, 0); if (fd < 0) - report_file_error (SDATA (string), Fcons (filename, Qnil)); + report_file_error (SSDATA (string), Fcons (filename, Qnil)); emacs_close (fd); return Qnil; @@ -2629,7 +2629,7 @@ memset (buf, 0, bufsize); errno = 0; - valsize = readlink (SDATA (filename), buf, bufsize); + valsize = readlink (SSDATA (filename), buf, bufsize); if (valsize == -1) { #ifdef ERANGE @@ -2678,7 +2678,7 @@ absname = ENCODE_FILE (absname); - if (stat (SDATA (absname), &st) < 0) + if (stat (SSDATA (absname), &st) < 0) return Qnil; return (st.st_mode & S_IFMT) == S_IFDIR ? Qt : Qnil; } @@ -2746,7 +2746,7 @@ return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil; } #else - if (stat (SDATA (absname), &st) < 0) + if (stat (SSDATA (absname), &st) < 0) return Qnil; return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil; #endif @@ -2903,7 +2903,7 @@ absname = ENCODE_FILE (absname); - if (stat (SDATA (absname), &st) < 0) + if (stat (SSDATA (absname), &st) < 0) return Qnil; return make_number (st.st_mode & 07777); @@ -2933,7 +2933,7 @@ encoded_absname = ENCODE_FILE (absname); - if (chmod (SDATA (encoded_absname), XINT (mode)) < 0) + if (chmod (SSDATA (encoded_absname), XINT (mode)) < 0) report_file_error ("Doing chmod", Fcons (absname, Qnil)); return Qnil; @@ -3000,7 +3000,7 @@ EMACS_SET_SECS (t, sec); EMACS_SET_USECS (t, usec); - if (set_file_times (SDATA (encoded_absname), t, t)) + if (set_file_times (SSDATA (encoded_absname), t, t)) { #ifdef DOS_NT struct stat st; @@ -3063,12 +3063,12 @@ absname2 = ENCODE_FILE (absname2); UNGCPRO; - if (stat (SDATA (absname1), &st) < 0) + if (stat (SSDATA (absname1), &st) < 0) return Qnil; mtime1 = st.st_mtime; - if (stat (SDATA (absname2), &st) < 0) + if (stat (SSDATA (absname2), &st) < 0) return Qt; return (mtime1 > st.st_mtime) ? Qt : Qnil; @@ -3250,12 +3250,12 @@ /* Tell stat to use expensive method to get accurate info. */ Vw32_get_true_file_attributes = Qt; - total = stat (SDATA (filename), &st); + total = stat (SSDATA (filename), &st); Vw32_get_true_file_attributes = tem; } if (total < 0) #else - if (stat (SDATA (filename), &st) < 0) + if (stat (SSDATA (filename), &st) < 0) #endif /* WINDOWSNT */ { if (fd >= 0) emacs_close (fd); @@ -3287,7 +3287,7 @@ #endif if (fd < 0) - if ((fd = emacs_open (SDATA (filename), O_RDONLY, 0)) < 0) + if ((fd = emacs_open (SSDATA (filename), O_RDONLY, 0)) < 0) goto badopen; /* Replacement should preserve point as it preserves markers. */ @@ -4975,8 +4975,8 @@ coding->produced -= emacs_write (desc, STRINGP (coding->dst_object) - ? SDATA (coding->dst_object) - : BYTE_POS_ADDR (coding->dst_pos_byte), + ? SSDATA (coding->dst_object) + : (char *) BYTE_POS_ADDR (coding->dst_pos_byte), coding->produced); if (coding->produced) @@ -5021,7 +5021,7 @@ filename = ENCODE_FILE (b->filename); - if (stat (SDATA (filename), &st) < 0) + if (stat (SSDATA (filename), &st) < 0) { /* If the file doesn't exist now and didn't exist before, we say that it isn't modified, provided the error is a tame one. */ @@ -5098,7 +5098,7 @@ filename = ENCODE_FILE (filename); - if (stat (SDATA (filename), &st) >= 0) + if (stat (SSDATA (filename), &st) >= 0) { current_buffer->modtime = st.st_mtime; current_buffer->modtime_size = st.st_size; @@ -5155,7 +5155,7 @@ /* Get visited file's mode to become the auto save file's mode. */ if (! NILP (current_buffer->filename)) { - if (stat (SDATA (current_buffer->filename), &st) >= 0) + if (stat (SSDATA (current_buffer->filename), &st) >= 0) /* But make sure we can overwrite it later! */ auto_save_mode_bits = st.st_mode | 0600; else if ((modes = Ffile_modes (current_buffer->filename), @@ -5278,7 +5278,7 @@ UNGCPRO; } - stream = fopen (SDATA (listfile), "w"); + stream = fopen (SSDATA (listfile), "w"); } record_unwind_protect (do_auto_save_unwind, === modified file 'src/filelock.c' --- src/filelock.c 2011-01-25 04:08:28 +0000 +++ src/filelock.c 2011-01-30 22:17:44 +0000 @@ -214,9 +214,9 @@ if (! NILP (filename)) { - get_boot_time_1 (SDATA (filename), 1); + get_boot_time_1 (SSDATA (filename), 1); if (delete_flag) - unlink (SDATA (filename)); + unlink (SSDATA (filename)); } } @@ -315,7 +315,7 @@ struct stat st; int count = 0; - strcpy (lockfile, SDATA (fn)); + strcpy (lockfile, SSDATA (fn)); /* Shift the nondirectory part of the file name (including the null) right two characters. Here is one of the places where we'd have to @@ -475,7 +475,7 @@ /* On current host? */ if (STRINGP (Fsystem_name ()) - && strcmp (owner->host, SDATA (Fsystem_name ())) == 0) + && strcmp (owner->host, SSDATA (Fsystem_name ())) == 0) { if (owner->pid == getpid ()) ret = 2; /* We own it. */ === modified file 'src/fns.c' --- src/fns.c 2011-01-25 04:08:28 +0000 +++ src/fns.c 2011-01-30 22:17:44 +0000 @@ -908,7 +908,7 @@ /* If all the chars are ASCII, they won't need any more bytes once converted. */ if (nbytes == SBYTES (string)) - return make_multibyte_string (SDATA (string), nbytes, nbytes); + return make_multibyte_string (SSDATA (string), nbytes, nbytes); SAFE_ALLOCA (buf, unsigned char *, nbytes); memcpy (buf, SDATA (string), SBYTES (string)); @@ -1171,7 +1171,7 @@ if (STRINGP (string)) { - res = make_specified_string (SDATA (string) + from_byte, + res = make_specified_string (SSDATA (string) + from_byte, to_char - from_char, to_byte - from_byte, STRING_MULTIBYTE (string)); copy_text_properties (make_number (from_char), make_number (to_char), @@ -1235,7 +1235,7 @@ args_out_of_range_3 (string, make_number (from_char), make_number (to_char)); - return make_specified_string (SDATA (string) + from_byte, + return make_specified_string (SSDATA (string) + from_byte, to_char - from_char, to_byte - from_byte, STRING_MULTIBYTE (string)); } @@ -1266,7 +1266,7 @@ if (STRINGP (string)) { - res = make_specified_string (SDATA (string) + from_byte, + res = make_specified_string (SSDATA (string) + from_byte, to - from, to_byte - from_byte, STRING_MULTIBYTE (string)); copy_text_properties (make_number (from), make_number (to), @@ -2496,12 +2496,12 @@ ans = Fdowncase (Fread_from_minibuffer (prompt, Qnil, Qnil, Qnil, Qyes_or_no_p_history, Qnil, Qnil)); - if (SCHARS (ans) == 3 && !strcmp (SDATA (ans), "yes")) + if (SCHARS (ans) == 3 && !strcmp (SSDATA (ans), "yes")) { UNGCPRO; return Qt; } - if (SCHARS (ans) == 2 && !strcmp (SDATA (ans), "no")) + if (SCHARS (ans) == 2 && !strcmp (SSDATA (ans), "no")) { UNGCPRO; return Qnil; @@ -3038,7 +3038,7 @@ /* We need to allocate enough room for decoding the text. */ SAFE_ALLOCA (encoded, char *, allength); - encoded_length = base64_encode_1 (SDATA (string), + encoded_length = base64_encode_1 (SSDATA (string), encoded, length, NILP (no_line_break), STRING_MULTIBYTE (string)); if (encoded_length > allength) @@ -3233,7 +3233,7 @@ SAFE_ALLOCA (decoded, char *, length); /* The decoded result should be unibyte. */ - decoded_length = base64_decode_1 (SDATA (string), decoded, length, + decoded_length = base64_decode_1 (SSDATA (string), decoded, length, 0, NULL); if (decoded_length > length) abort (); @@ -4745,7 +4745,7 @@ object = code_convert_string (object, coding_system, Qnil, 1, 0, 0); } - md5_buffer (SDATA (object) + start_byte, + md5_buffer (SSDATA (object) + start_byte, SBYTES (object) - (size_byte - end_byte), digest); @@ -4936,4 +4936,3 @@ init_fns (void) { } - === modified file 'src/font.c' --- src/font.c 2011-01-30 00:35:35 +0000 +++ src/font.c 2011-01-30 22:17:44 +0000 @@ -3591,7 +3591,7 @@ { Lisp_Object key = XCAR (XCAR (it)); Lisp_Object val = XCDR (XCAR (it)); - char *keystr = SDATA (SYMBOL_NAME (key)); + char *keystr = SSDATA (SYMBOL_NAME (key)); if (strcmp (boolean_properties[i], keystr) == 0) { @@ -3616,7 +3616,7 @@ { Lisp_Object key = XCAR (XCAR (it)); Lisp_Object val = XCDR (XCAR (it)); - char *keystr = SDATA (SYMBOL_NAME (key)); + char *keystr = SSDATA (SYMBOL_NAME (key)); if (strcmp (non_boolean_properties[i], keystr) == 0) Ffont_put (font, key, val); } === modified file 'src/frame.c' --- src/frame.c 2011-01-26 08:36:39 +0000 +++ src/frame.c 2011-01-30 22:17:44 +0000 @@ -693,7 +693,7 @@ if (!NILP (tty)) { name = (char *) alloca (SBYTES (tty) + 1); - strncpy (name, SDATA (tty), SBYTES (tty)); + strncpy (name, SSDATA (tty), SBYTES (tty)); name[SBYTES (tty)] = 0; } @@ -704,7 +704,7 @@ if (!NILP (tty_type)) { type = (char *) alloca (SBYTES (tty_type) + 1); - strncpy (type, SDATA (tty_type), SBYTES (tty_type)); + strncpy (type, SSDATA (tty_type), SBYTES (tty_type)); type[SBYTES (tty_type)] = 0; } @@ -2176,7 +2176,7 @@ /* Check for no change needed in this very common case before we do any consing. */ - if (frame_name_fnn_p (SDATA (f->name), + if (frame_name_fnn_p (SSDATA (f->name), SBYTES (f->name))) return; @@ -2194,7 +2194,7 @@ /* Don't allow the user to set the frame name to F, so it doesn't clash with the names we generate for terminal frames. */ - if (frame_name_fnn_p (SDATA (name), SBYTES (name))) + if (frame_name_fnn_p (SSDATA (name), SBYTES (name))) error ("Frame names of the form F are usurped by Emacs"); } @@ -2321,11 +2321,11 @@ elt = Fassq (Qforeground_color, alist); if (CONSP (elt) && STRINGP (XCDR (elt))) { - if (strncmp (SDATA (XCDR (elt)), + if (strncmp (SSDATA (XCDR (elt)), unspecified_bg, SCHARS (XCDR (elt))) == 0) store_in_alist (&alist, Qforeground_color, tty_color_name (f, bg)); - else if (strncmp (SDATA (XCDR (elt)), + else if (strncmp (SSDATA (XCDR (elt)), unspecified_fg, SCHARS (XCDR (elt))) == 0) store_in_alist (&alist, Qforeground_color, tty_color_name (f, fg)); @@ -2335,11 +2335,11 @@ elt = Fassq (Qbackground_color, alist); if (CONSP (elt) && STRINGP (XCDR (elt))) { - if (strncmp (SDATA (XCDR (elt)), + if (strncmp (SSDATA (XCDR (elt)), unspecified_fg, SCHARS (XCDR (elt))) == 0) store_in_alist (&alist, Qbackground_color, tty_color_name (f, fg)); - else if (strncmp (SDATA (XCDR (elt)), + else if (strncmp (SSDATA (XCDR (elt)), unspecified_bg, SCHARS (XCDR (elt))) == 0) store_in_alist (&alist, Qbackground_color, tty_color_name (f, bg)); @@ -2428,7 +2428,7 @@ if (EQ (parameter, Qbackground_color)) { - color_name = SDATA (value); + color_name = SSDATA (value); csz = SCHARS (value); if (strncmp (color_name, unspecified_bg, csz) == 0) value = tty_color_name (f, FRAME_BACKGROUND_PIXEL (f)); @@ -2437,7 +2437,7 @@ } else if (EQ (parameter, Qforeground_color)) { - color_name = SDATA (value); + color_name = SSDATA (value); csz = SCHARS (value); if (strncmp (color_name, unspecified_fg, csz) == 0) value = tty_color_name (f, FRAME_FOREGROUND_PIXEL (f)); @@ -3307,16 +3307,16 @@ fontset = fs_query_fontset (arg, 0); if (fontset < 0) { - font_object = font_open_by_name (f, SDATA (arg)); + font_object = font_open_by_name (f, SSDATA (arg)); if (NILP (font_object)) - error ("Font `%s' is not defined", SDATA (arg)); + error ("Font `%s' is not defined", SSDATA (arg)); arg = AREF (font_object, FONT_NAME_INDEX); } else if (fontset > 0) { Lisp_Object ascii_font = fontset_ascii (fontset); - font_object = font_open_by_name (f, SDATA (ascii_font)); + font_object = font_open_by_name (f, SSDATA (ascii_font)); if (NILP (font_object)) error ("Font `%s' is not defined", SDATA (arg)); arg = AREF (font_object, FONT_NAME_INDEX); @@ -3394,7 +3394,7 @@ char *p0, *p1; CHECK_STRING (new_value); - p0 = p1 = SDATA (new_value); + p0 = p1 = SSDATA (new_value); new_value = Qnil; while (*p0) { @@ -3771,23 +3771,23 @@ /* Start with emacs.FRAMENAME for the name (the specific one) and with `Emacs' for the class key (the general one). */ - strcpy (name_key, SDATA (Vx_resource_name)); - strcpy (class_key, SDATA (Vx_resource_class)); + strcpy (name_key, SSDATA (Vx_resource_name)); + strcpy (class_key, SSDATA (Vx_resource_class)); strcat (class_key, "."); - strcat (class_key, SDATA (class)); + strcat (class_key, SSDATA (class)); if (!NILP (component)) { strcat (class_key, "."); - strcat (class_key, SDATA (subclass)); + strcat (class_key, SSDATA (subclass)); strcat (name_key, "."); - strcat (name_key, SDATA (component)); + strcat (name_key, SSDATA (component)); } strcat (name_key, "."); - strcat (name_key, SDATA (attribute)); + strcat (name_key, SSDATA (attribute)); value = x_get_string_resource (rdb, name_key, class_key); @@ -3904,25 +3904,25 @@ switch (type) { case RES_TYPE_NUMBER: - return make_number (atoi (SDATA (tem))); + return make_number (atoi (SSDATA (tem))); case RES_TYPE_BOOLEAN_NUMBER: - if (!strcmp (SDATA (tem), "on") - || !strcmp (SDATA (tem), "true")) + if (!strcmp (SSDATA (tem), "on") + || !strcmp (SSDATA (tem), "true")) return make_number (1); - return make_number (atoi (SDATA (tem))); + return make_number (atoi (SSDATA (tem))); break; case RES_TYPE_FLOAT: - return make_float (atof (SDATA (tem))); + return make_float (atof (SSDATA (tem))); case RES_TYPE_BOOLEAN: tem = Fdowncase (tem); - if (!strcmp (SDATA (tem), "on") + if (!strcmp (SSDATA (tem), "on") #ifdef HAVE_NS - || !strcmp(SDATA(tem), "yes") + || !strcmp (SSDATA (tem), "yes") #endif - || !strcmp (SDATA (tem), "true")) + || !strcmp (SSDATA (tem), "true")) return Qt; else return Qnil; @@ -3936,17 +3936,17 @@ { Lisp_Object lower; lower = Fdowncase (tem); - if (!strcmp (SDATA (lower), "on") + if (!strcmp (SSDATA (lower), "on") #ifdef HAVE_NS - || !strcmp(SDATA(lower), "yes") + || !strcmp (SSDATA (lower), "yes") #endif - || !strcmp (SDATA (lower), "true")) + || !strcmp (SSDATA (lower), "true")) return Qt; - else if (!strcmp (SDATA (lower), "off") + else if (!strcmp (SSDATA (lower), "off") #ifdef HAVE_NS - || !strcmp(SDATA(lower), "no") + || !strcmp (SSDATA (lower), "no") #endif - || !strcmp (SDATA (lower), "false")) + || !strcmp (SSDATA (lower), "false")) return Qnil; else return Fintern (tem, Qnil); === modified file 'src/image.c' --- src/image.c 2011-01-25 04:08:28 +0000 +++ src/image.c 2011-01-30 22:17:44 +0000 @@ -376,7 +376,7 @@ dpyinfo->bitmaps[id - 1].depth = 1; dpyinfo->bitmaps[id - 1].height = height; dpyinfo->bitmaps[id - 1].width = width; - strcpy (dpyinfo->bitmaps[id - 1].file, SDATA (file)); + strcpy (dpyinfo->bitmaps[id - 1].file, SSDATA (file)); return id; #endif /* HAVE_X_WINDOWS */ @@ -770,7 +770,7 @@ /* Find key in KEYWORDS. Error if not found. */ for (i = 0; i < nkeywords; ++i) - if (strcmp (keywords[i].name, SDATA (SYMBOL_NAME (key))) == 0) + if (strcmp (keywords[i].name, SSDATA (SYMBOL_NAME (key))) == 0) break; if (i == nkeywords) @@ -1366,7 +1366,7 @@ xassert (STRINGP (color_name)); - if (x_defined_color (f, SDATA (color_name), &color, 1)) + if (x_defined_color (f, SSDATA (color_name), &color, 1)) { /* This isn't called frequently so we get away with simply reallocating the color vector to the needed size, here. */ @@ -2857,7 +2857,7 @@ return 0; } - contents = slurp_file (SDATA (file), &size); + contents = slurp_file (SSDATA (file), &size); if (contents == NULL) { image_error ("Error loading XBM image `%s'", img->spec, Qnil); @@ -2934,7 +2934,7 @@ } } else if (STRINGP (data)) - bits = SDATA (data); + bits = SSDATA (data); else bits = XBOOL_VECTOR (data)->data; @@ -3441,14 +3441,14 @@ if (STRINGP (name)) { xpm_syms[i].name = (char *) alloca (SCHARS (name) + 1); - strcpy (xpm_syms[i].name, SDATA (name)); + strcpy (xpm_syms[i].name, SSDATA (name)); } else xpm_syms[i].name = ""; if (STRINGP (color)) { xpm_syms[i].value = (char *) alloca (SCHARS (color) + 1); - strcpy (xpm_syms[i].value, SDATA (color)); + strcpy (xpm_syms[i].value, SSDATA (color)); } else xpm_syms[i].value = ""; @@ -3491,7 +3491,7 @@ &attrs); #else rc = XpmReadFileToPixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - SDATA (file), &img->pixmap, &img->mask, + SSDATA (file), &img->pixmap, &img->mask, &attrs); #endif /* HAVE_NTGUI */ } @@ -3514,7 +3514,7 @@ &attrs); #else rc = XpmCreatePixmapFromBuffer (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - SDATA (buffer), + SSDATA (buffer), &img->pixmap, &img->mask, &attrs); #endif /* HAVE_NTGUI */ @@ -5101,7 +5101,7 @@ return 0; } - contents = slurp_file (SDATA (file), &size); + contents = slurp_file (SSDATA (file), &size); if (contents == NULL) { image_error ("Error reading `%s'", file, Qnil); @@ -5603,7 +5603,7 @@ } /* Open the image file. */ - fp = fopen (SDATA (file), "rb"); + fp = fopen (SSDATA (file), "rb"); if (!fp) { image_error ("Cannot open image file `%s'", file, Qnil); @@ -5740,7 +5740,7 @@ /* The user specified `:background', use that. */ { XColor color; - if (x_defined_color (f, SDATA (specified_bg), &color, 0)) + if (x_defined_color (f, SSDATA (specified_bg), &color, 0)) { png_color_16 user_bg; @@ -6321,7 +6321,7 @@ return 0; } - fp = fopen (SDATA (file), "rb"); + fp = fopen (SSDATA (file), "rb"); if (fp == NULL) { image_error ("Cannot open `%s'", file, Qnil); @@ -6756,7 +6756,7 @@ /* Try to open the image file. Casting return value avoids a GCC warning on W32. */ - tiff = (TIFF *)fn_TIFFOpen (SDATA (file), "r"); + tiff = (TIFF *)fn_TIFFOpen (SSDATA (file), "r"); if (tiff == NULL) { image_error ("Cannot open `%s'", file, Qnil); === modified file 'src/indent.c' --- src/indent.c 2011-01-25 04:08:28 +0000 +++ src/indent.c 2011-01-30 22:17:44 +0000 @@ -2046,7 +2046,7 @@ it_overshoot_expected = 1; else if (it.method == GET_FROM_STRING) { - const char *s = SDATA (it.string); + const char *s = SSDATA (it.string); const char *e = s + SBYTES (it.string); while (s < e && *s != '\n') ++s; @@ -2164,4 +2164,3 @@ defsubr (&Svertical_motion); defsubr (&Scompute_motion); } - === modified file 'src/keyboard.c' --- src/keyboard.c 2011-01-29 15:17:00 +0000 +++ src/keyboard.c 2011-01-30 22:17:44 +0000 @@ -6025,7 +6025,7 @@ #define MULTI_LETTER_MOD(BIT, NAME, LEN) \ if (i + LEN + 1 <= SBYTES (name) \ - && ! strncmp (SDATA (name) + i, NAME, LEN)) \ + && ! strncmp (SSDATA (name) + i, NAME, LEN)) \ { \ this_mod_end = i + LEN; \ this_mod = BIT; \ @@ -6063,13 +6063,13 @@ if (! (modifiers & (down_modifier | drag_modifier | double_modifier | triple_modifier)) && i + 7 == SBYTES (name) - && strncmp (SDATA (name) + i, "mouse-", 6) == 0 + && strncmp (SSDATA (name) + i, "mouse-", 6) == 0 && ('0' <= SREF (name, i + 6) && SREF (name, i + 6) <= '9')) modifiers |= click_modifier; if (! (modifiers & (double_modifier | triple_modifier)) && i + 6 < SBYTES (name) - && strncmp (SDATA (name) + i, "wheel-", 6) == 0) + && strncmp (SSDATA (name) + i, "wheel-", 6) == 0) modifiers |= click_modifier; if (modifier_end) @@ -6187,7 +6187,7 @@ Lisp_Object unmodified; Lisp_Object mask; - unmodified = Fintern (make_string (SDATA (SYMBOL_NAME (symbol)) + end, + unmodified = Fintern (make_string (SSDATA (SYMBOL_NAME (symbol)) + end, SBYTES (SYMBOL_NAME (symbol)) - end), Qnil); @@ -6255,7 +6255,7 @@ { /* We have to create the symbol ourselves. */ new_symbol = apply_modifiers_uncached (modifiers, - SDATA (SYMBOL_NAME (base)), + SSDATA (SYMBOL_NAME (base)), SCHARS (SYMBOL_NAME (base)), SBYTES (SYMBOL_NAME (base))); @@ -8084,7 +8084,7 @@ item = XCDR (item); if (!CONSP (item)) { - if (menu_separator_name_p (SDATA (caption))) + if (menu_separator_name_p (SSDATA (caption))) { PROP (TOOL_BAR_ITEM_TYPE) = Qt; #if !defined (USE_GTK) && !defined (HAVE_NS) @@ -8439,7 +8439,7 @@ menu = read_char_minibuf_menu_text; /* Prompt string always starts with map's prompt, and a space. */ - strcpy (menu, SDATA (name)); + strcpy (menu, SSDATA (name)); nlength = SBYTES (name); menu[nlength++] = ':'; menu[nlength++] = ' '; @@ -10562,7 +10562,7 @@ if (!NILP (file)) { file = Fexpand_file_name (file, Qnil); - dribble = fopen (SDATA (file), "w"); + dribble = fopen (SSDATA (file), "w"); if (dribble == 0) report_file_error ("Opening dribble", Fcons (file, Qnil)); } === modified file 'src/lread.c' --- src/lread.c 2011-01-25 04:08:28 +0000 +++ src/lread.c 2011-01-30 22:17:44 +0000 @@ -963,10 +963,10 @@ { /* Don't insist on adding a suffix if FILE already ends with one. */ if (size > 3 - && !strcmp (SDATA (file) + size - 3, ".el")) + && !strcmp (SSDATA (file) + size - 3, ".el")) must_suffix = Qnil; else if (size > 4 - && !strcmp (SDATA (file) + size - 4, ".elc")) + && !strcmp (SSDATA (file) + size - 4, ".elc")) must_suffix = Qnil; /* Don't insist on adding a suffix if the argument includes a directory name. */ @@ -1348,19 +1348,19 @@ && SREF (filename, 0) == '/' && SREF (filename, 1) == ':') { - strncpy (fn, SDATA (filename) + 2, + strncpy (fn, SSDATA (filename) + 2, SBYTES (filename) - 2); fn[SBYTES (filename) - 2] = 0; } else { - strncpy (fn, SDATA (filename), + strncpy (fn, SSDATA (filename), SBYTES (filename)); fn[SBYTES (filename)] = 0; } if (lsuffix != 0) /* Bug happens on CCI if lsuffix is 0. */ - strncat (fn, SDATA (XCAR (tail)), lsuffix); + strncat (fn, SSDATA (XCAR (tail)), lsuffix); /* Check that the file exists and is not a directory. */ /* We used to only check for handlers on non-absolute file names: @@ -1395,7 +1395,7 @@ const char *pfn; encoded_fn = ENCODE_FILE (string); - pfn = SDATA (encoded_fn); + pfn = SSDATA (encoded_fn); exists = (stat (pfn, &st) >= 0 && (st.st_mode & S_IFMT) != S_IFDIR); if (exists) @@ -3527,7 +3527,7 @@ CHECK_STRING (string); - tem = oblookup (obarray, SDATA (string), + tem = oblookup (obarray, SSDATA (string), SCHARS (string), SBYTES (string)); if (!INTEGERP (tem)) @@ -3580,7 +3580,7 @@ else string = SYMBOL_NAME (name); - tem = oblookup (obarray, SDATA (string), SCHARS (string), SBYTES (string)); + tem = oblookup (obarray, SSDATA (string), SCHARS (string), SBYTES (string)); if (INTEGERP (tem) || (SYMBOLP (name) && !EQ (name, tem))) return Qnil; else @@ -3609,7 +3609,7 @@ string = name; } - tem = oblookup (obarray, SDATA (string), + tem = oblookup (obarray, SSDATA (string), SCHARS (string), SBYTES (string)); if (INTEGERP (tem)) @@ -4055,7 +4055,7 @@ if (STRINGP (dirfile)) { dirfile = Fdirectory_file_name (dirfile); - if (access (SDATA (dirfile), 0) < 0) + if (access (SSDATA (dirfile), 0) < 0) dir_warning ("Warning: Lisp directory `%s' does not exist.\n", XCAR (path_tail)); } === modified file 'src/minibuf.c' --- src/minibuf.c 2011-01-25 04:08:28 +0000 +++ src/minibuf.c 2011-01-30 22:17:44 +0000 @@ -1762,7 +1762,7 @@ { /* Bypass intern-soft as that loses for nil. */ tem = oblookup (collection, - SDATA (string), + SSDATA (string), SCHARS (string), SBYTES (string)); if (!SYMBOLP (tem)) @@ -1773,7 +1773,7 @@ string = Fstring_make_multibyte (string); tem = oblookup (collection, - SDATA (string), + SSDATA (string), SCHARS (string), SBYTES (string)); } @@ -2185,4 +2185,3 @@ defsubr (&Sassoc_string); defsubr (&Scompleting_read); } - === modified file 'src/print.c' --- src/print.c 2011-01-26 08:36:39 +0000 +++ src/print.c 2011-01-30 22:17:44 +0000 @@ -411,7 +411,7 @@ } else /* No need to copy, since output to print_buffer can't GC. */ - strout (SDATA (string), + strout (SSDATA (string), chars, SBYTES (string), printcharfun, STRING_MULTIBYTE (string)); } @@ -584,7 +584,7 @@ GCPRO1(args); name = Feval (Fcar (args)); CHECK_STRING (name); - temp_output_buffer_setup (SDATA (name)); + temp_output_buffer_setup (SSDATA (name)); buf = Vstandard_output; UNGCPRO; @@ -1097,7 +1097,7 @@ if (cp[1] != 0) goto lose; - sprintf (buf, SDATA (Vfloat_output_format), data); + sprintf (buf, SSDATA (Vfloat_output_format), data); } /* Make sure there is a decimal point with digit after, or an @@ -1511,7 +1511,7 @@ PRINTCHAR ('f'); } else if (multibyte - && (CHAR_BYTE8_P (c) + && (CHAR_BYTE8_P (c) || (! ASCII_CHAR_P (c) && print_escape_multibyte))) { /* When multibyte is disabled, @@ -1933,7 +1933,7 @@ if (NATNUMP (Vprint_length) && XFASTINT (Vprint_length) < size) size = XFASTINT (Vprint_length); - + PRINTCHAR ('('); for (i = 0; i < size; i++) if (!NILP (HASH_HASH (h, i))) @@ -2311,4 +2311,3 @@ defsubr (&Swith_output_to_temp_buffer); } - === modified file 'src/process.c' --- src/process.c 2011-01-26 08:36:39 +0000 +++ src/process.c 2011-01-30 22:17:44 +0000 @@ -498,7 +498,7 @@ if (! NILP (Vlocale_coding_system)) string = (code_convert_string_norecord (string, Vlocale_coding_system, 0)); - c1 = STRING_CHAR (SSDATA (string)); + c1 = STRING_CHAR (SDATA (string)); c2 = DOWNCASE (c1); if (c1 != c2) Faset (string, make_number (0), make_number (c2)); @@ -1447,7 +1447,7 @@ Lisp_Object speed = Fplist_get (p->childp, QCspeed); insert_string ("(serial port "); if (STRINGP (port)) - insert_string (SDATA (port)); + insert_string (SSDATA (port)); else insert_string ("?"); if (INTEGERP (speed)) @@ -3262,7 +3262,7 @@ CHECK_STRING (service); memset (&address_un, 0, sizeof address_un); address_un.sun_family = AF_LOCAL; - strncpy (address_un.sun_path, SDATA (service), sizeof address_un.sun_path); + strncpy (address_un.sun_path, SSDATA (service), sizeof address_un.sun_path); ai.ai_addr = (struct sockaddr *) &address_un; ai.ai_addrlen = sizeof address_un; goto open_socket; @@ -3298,7 +3298,7 @@ else { CHECK_STRING (service); - portstring = SDATA (service); + portstring = SSDATA (service); } immediate_quit = 1; @@ -3313,12 +3313,12 @@ res_init (); #endif - ret = getaddrinfo (SDATA (host), portstring, &hints, &res); + ret = getaddrinfo (SSDATA (host), portstring, &hints, &res); if (ret) #ifdef HAVE_GAI_STRERROR - error ("%s/%s %s", SDATA (host), portstring, gai_strerror (ret)); + error ("%s/%s %s", SSDATA (host), portstring, gai_strerror (ret)); #else - error ("%s/%s getaddrinfo error %d", SDATA (host), portstring, ret); + error ("%s/%s getaddrinfo error %d", SSDATA (host), portstring, ret); #endif immediate_quit = 0; @@ -3337,7 +3337,7 @@ { struct servent *svc_info; CHECK_STRING (service); - svc_info = getservbyname (SDATA (service), + svc_info = getservbyname (SSDATA (service), (socktype == SOCK_DGRAM ? "udp" : "tcp")); if (svc_info == 0) error ("Unknown service: %s", SDATA (service)); @@ -5807,7 +5807,7 @@ int fd; /* Some OS:es (Solaris 8/9) does not allow TIOCGPGRP from the master side. Try the slave side. */ - fd = emacs_open (SDATA (p->tty_name), O_RDONLY, 0); + fd = emacs_open (SSDATA (p->tty_name), O_RDONLY, 0); if (fd != -1) { === modified file 'src/search.c' --- src/search.c 2011-01-25 04:08:28 +0000 +++ src/search.c 2011-01-30 22:17:44 +0000 @@ -148,7 +148,7 @@ | (posix ? 0 : RE_NO_POSIX_BACKTRACKING)); if (STRINGP (Vsearch_spaces_regexp)) - re_set_whitespace_regexp (SDATA (Vsearch_spaces_regexp)); + re_set_whitespace_regexp (SSDATA (Vsearch_spaces_regexp)); else re_set_whitespace_regexp (NULL); === modified file 'src/widget.c' --- src/widget.c 2011-01-25 04:08:28 +0000 +++ src/widget.c 2011-01-30 22:17:44 +0000 @@ -560,7 +560,7 @@ if (STRINGP (font)) { XFontStruct *xfont = XLoadQueryFont (FRAME_X_DISPLAY_INFO (s)->display, - SDATA (font)); + SSDATA (font)); if (xfont) { gc_values.font = xfont->fid; @@ -840,4 +840,3 @@ ew->emacs_frame.internal_border_width = f->internal_border_width; } - === modified file 'src/xdisp.c' --- src/xdisp.c 2011-01-28 04:53:17 +0000 +++ src/xdisp.c 2011-01-30 22:17:44 +0000 @@ -2778,7 +2778,7 @@ to 16 in 22.1 to make this a lesser problem. */ for (i = 0; i < it->n_overlay_strings && i < OVERLAY_STRING_CHUNK_SIZE; ++i) { - const char *s = SDATA (it->overlay_strings[i]); + const char *s = SSDATA (it->overlay_strings[i]); const char *e = s + SBYTES (it->overlay_strings[i]); while (s < e && *s != '\n') @@ -20077,7 +20077,7 @@ { if (SCHARS (SYMBOL_NAME (prop)) == 2) { - char *unit = SDATA (SYMBOL_NAME (prop)); + char *unit = SSDATA (SYMBOL_NAME (prop)); if (unit[0] == 'i' && unit[1] == 'n') pixels = 1.0; === modified file 'src/xfaces.c' --- src/xfaces.c 2011-01-26 08:36:39 +0000 +++ src/xfaces.c 2011-01-30 22:17:44 +0000 @@ -979,7 +979,7 @@ h = XINT (Fcar (Fcdr (name))); bits = Fcar (Fcdr (Fcdr (name))); - bitmap_id = x_create_bitmap_from_data (f, SDATA (bits), + bitmap_id = x_create_bitmap_from_data (f, SSDATA (bits), w, h); } else @@ -1271,7 +1271,7 @@ else CHECK_FRAME (frame); f = XFRAME (frame); - return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil; + return face_color_gray_p (f, SSDATA (color)) ? Qt : Qnil; } @@ -1292,7 +1292,7 @@ else CHECK_FRAME (frame); f = XFRAME (frame); - if (face_color_supported_p (f, SDATA (color), !NILP (background_p))) + if (face_color_supported_p (f, SSDATA (color), !NILP (background_p))) return Qt; return Qnil; } @@ -1322,7 +1322,7 @@ /* if the color map is full, defined_color will return a best match to the values in an existing cell. */ - if (!defined_color (f, SDATA (name), &color, 1)) + if (!defined_color (f, SSDATA (name), &color, 1)) { add_to_log ("Unable to load color \"%s\"", name, Qnil); @@ -1399,7 +1399,7 @@ face_color_supported_p is smart enough to know that grays are "supported" as background because we are supposed to use stipple for them. */ - if (!face_color_supported_p (f, SDATA (bg), 0) + if (!face_color_supported_p (f, SSDATA (bg), 0) && !NILP (Fbitmap_spec_p (Vface_default_stipple))) { x_destroy_bitmap (f, face->stipple); @@ -1586,7 +1586,7 @@ if (idx <= FONT_REGISTRY_INDEX) { if (STRINGP (val1)) - result = STRINGP (val2) ? strcmp (SDATA (val1), SDATA (val2)) : -1; + result = STRINGP (val2) ? strcmp (SSDATA (val1), SSDATA (val2)) : -1; else result = STRINGP (val2) ? 1 : 0; } @@ -2031,7 +2031,7 @@ Lisp_Object tortoise, hare; if (STRINGP (face_name)) - face_name = intern (SDATA (face_name)); + face_name = intern (SSDATA (face_name)); if (NILP (face_name) || !SYMBOLP (face_name)) return face_name; @@ -3502,7 +3502,7 @@ else if (EQ (attr, QCbold) || EQ (attr, QCitalic)) value = face_boolean_x_resource_value (value, 1); else if (EQ (attr, QCweight) || EQ (attr, QCslant) || EQ (attr, QCwidth)) - value = intern (SDATA (value)); + value = intern (SSDATA (value)); else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video)) value = face_boolean_x_resource_value (value, 1); else if (EQ (attr, QCunderline) @@ -3547,7 +3547,7 @@ char line[512]; Lisp_Object lface = lface_from_face_name (f, Qmenu, 1); struct face *face = FACE_FROM_ID (f, MENU_FACE_ID); - const char *myname = SDATA (Vx_resource_name); + const char *myname = SSDATA (Vx_resource_name); int changed_p = 0; #ifdef USE_MOTIF const char *popup_path = "popup_menu"; @@ -3608,7 +3608,7 @@ if (! NILP (xlfd)) { #if defined HAVE_X_I18N - char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif); + char *fontsetname = xic_create_fontsetname (SSDATA (xlfd), motif); #else char *fontsetname = SSDATA (xlfd); #endif @@ -4204,10 +4204,10 @@ f = XFRAME (frame); if (!(CONSP (color1) && parse_rgb_list (color1, &cdef1)) - && !(STRINGP (color1) && defined_color (f, SDATA (color1), &cdef1, 0))) + && !(STRINGP (color1) && defined_color (f, SSDATA (color1), &cdef1, 0))) signal_error ("Invalid color", color1); if (!(CONSP (color2) && parse_rgb_list (color2, &cdef2)) - && !(STRINGP (color2) && defined_color (f, SDATA (color2), &cdef2, 0))) + && !(STRINGP (color2) && defined_color (f, SSDATA (color2), &cdef2, 0))) signal_error ("Invalid color", color2); return make_number (color_distance (&cdef1, &cdef2)); === modified file 'src/xfns.c' --- src/xfns.c 2011-01-25 04:08:28 +0000 +++ src/xfns.c 2011-01-30 22:17:44 +0000 @@ -670,7 +670,7 @@ /* x_defined_color is responsible for coping with failures by looking for a near-miss. */ - if (x_defined_color (f, SDATA (color_name), &cdef, 1)) + if (x_defined_color (f, SSDATA (color_name), &cdef, 1)) return cdef.pixel; signal_error ("Undefined color", color_name); @@ -1603,7 +1603,7 @@ FRAME_X_DISPLAY_INFO (f)->Xatom_net_wm_name, FRAME_X_DISPLAY_INFO (f)->Xatom_UTF8_STRING, 8, PropModeReplace, - SSDATA (encoded_name), + SDATA (encoded_name), SBYTES (encoded_name)); #endif /* not USE_GTK */ @@ -1612,7 +1612,7 @@ FRAME_X_DISPLAY_INFO (f)->Xatom_net_wm_icon_name, FRAME_X_DISPLAY_INFO (f)->Xatom_UTF8_STRING, 8, PropModeReplace, - SSDATA (encoded_icon_name), + SDATA (encoded_icon_name), SBYTES (encoded_icon_name)); if (do_free_icon_value) @@ -1658,7 +1658,7 @@ /* Check for no change needed in this very common case before we do any consing. */ if (!strcmp (FRAME_X_DISPLAY_INFO (f)->x_id_name, - SDATA (f->name))) + SSDATA (f->name))) return; name = build_string (FRAME_X_DISPLAY_INFO (f)->x_id_name); } @@ -3549,7 +3549,7 @@ CHECK_STRING (color); - if (x_defined_color (f, SDATA (color), &foo, 0)) + if (x_defined_color (f, SSDATA (color), &foo, 0)) return Qt; else return Qnil; @@ -3564,7 +3564,7 @@ CHECK_STRING (color); - if (x_defined_color (f, SDATA (color), &foo, 0)) + if (x_defined_color (f, SSDATA (color), &foo, 0)) return list3 (make_number (foo.red), make_number (foo.green), make_number (foo.blue)); @@ -3965,7 +3965,7 @@ int i, class = -1; XVisualInfo vinfo; - strcpy (s, SDATA (value)); + strcpy (s, SSDATA (value)); dash = strchr (s, '-'); if (dash) { @@ -4244,11 +4244,11 @@ } BLOCK_INPUT; - prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SDATA (prop), False); + prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SSDATA (prop), False); if (! NILP (type)) { CHECK_STRING (type); - target_type = XInternAtom (FRAME_X_DISPLAY (f), SDATA (type), False); + target_type = XInternAtom (FRAME_X_DISPLAY (f), SSDATA (type), False); } if (! NILP (outer_p)) w = FRAME_OUTER_WINDOW (f); @@ -4279,7 +4279,7 @@ CHECK_STRING (prop); BLOCK_INPUT; - prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SDATA (prop), False); + prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SSDATA (prop), False); XDeleteProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), prop_atom); /* Make sure the property is removed when we return. */ @@ -4343,13 +4343,13 @@ BLOCK_INPUT; if (STRINGP (type)) { - if (strcmp ("AnyPropertyType", SDATA (type)) == 0) + if (strcmp ("AnyPropertyType", SSDATA (type)) == 0) target_type = AnyPropertyType; else - target_type = XInternAtom (FRAME_X_DISPLAY (f), SDATA (type), False); + target_type = XInternAtom (FRAME_X_DISPLAY (f), SSDATA (type), False); } - prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SDATA (prop), False); + prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SSDATA (prop), False); rc = XGetWindowProperty (FRAME_X_DISPLAY (f), target_window, prop_atom, 0, 0, False, target_type, &actual_type, &actual_format, &actual_size, === modified file 'src/xml.c' --- src/xml.c 2011-01-25 04:08:28 +0000 +++ src/xml.c 2011-01-30 22:17:44 +0000 @@ -96,7 +96,7 @@ if (! NILP (base_url)) { CHECK_STRING (base_url); - burl = SDATA (base_url); + burl = SSDATA (base_url); } bytes = CHAR_TO_BYTE (iend) - CHAR_TO_BYTE (istart); === modified file 'src/xselect.c' --- src/xselect.c 2011-01-25 04:08:28 +0000 +++ src/xselect.c 2011-01-30 22:17:44 +0000 @@ -2502,7 +2502,7 @@ CHECK_STRING (message_type); x_send_client_event(display, dest, from, XInternAtom (dpyinfo->display, - SDATA (message_type), + SSDATA (message_type), False), format, values); @@ -2538,9 +2538,9 @@ } else if (STRINGP (dest)) { - if (strcmp (SDATA (dest), "PointerWindow") == 0) + if (strcmp (SSDATA (dest), "PointerWindow") == 0) wdest = PointerWindow; - else if (strcmp (SDATA (dest), "InputFocus") == 0) + else if (strcmp (SSDATA (dest), "InputFocus") == 0) wdest = InputFocus; else error ("DEST as a string must be one of PointerWindow or InputFocus"); === modified file 'src/xterm.c' --- src/xterm.c 2011-01-26 08:36:39 +0000 +++ src/xterm.c 2011-01-30 22:17:44 +0000 @@ -7949,7 +7949,7 @@ && (FRAME_XIC_STYLE (f) & (XIMPreeditPosition | XIMStatusArea))) { BLOCK_INPUT; - xic_set_xfontset (f, SDATA (fontset_ascii (fontset))); + xic_set_xfontset (f, SSDATA (fontset_ascii (fontset))); UNBLOCK_INPUT; } #endif @@ -9873,7 +9873,7 @@ ++x_initialized; } - if (! x_display_ok (SDATA (display_name))) + if (! x_display_ok (SSDATA (display_name))) error ("Display %s can't be opened", SDATA (display_name)); #ifdef USE_GTK @@ -9965,7 +9965,7 @@ argv[argc++] = xrm_option; } turn_on_atimers (0); - dpy = XtOpenDisplay (Xt_app_con, SDATA (display_name), + dpy = XtOpenDisplay (Xt_app_con, SSDATA (display_name), resource_name, EMACS_CLASS, emacs_options, XtNumber (emacs_options), &argc, argv); @@ -10004,8 +10004,8 @@ for (share = x_display_list, tail = x_display_name_list; share; share = share->next, tail = XCDR (tail)) - if (same_x_server (SDATA (XCAR (XCAR (tail))), - SDATA (display_name))) + if (same_x_server (SSDATA (XCAR (XCAR (tail))), + SSDATA (display_name))) break; if (share) terminal->kboard = share->terminal->kboard; @@ -10066,7 +10066,7 @@ /* Set the name of the terminal. */ terminal->name = (char *) xmalloc (SBYTES (display_name) + 1); - strncpy (terminal->name, SDATA (display_name), SBYTES (display_name)); + strncpy (terminal->name, SSDATA (display_name), SBYTES (display_name)); terminal->name[SBYTES (display_name)] = 0; #if 0 @@ -10157,8 +10157,8 @@ build_string ("PrivateColormap"), Qnil, Qnil); if (STRINGP (value) - && (!strcmp (SDATA (value), "true") - || !strcmp (SDATA (value), "on"))) + && (!strcmp (SSDATA (value), "true") + || !strcmp (SSDATA (value), "on"))) dpyinfo->cmap = XCopyColormapAndFree (dpyinfo->display, dpyinfo->cmap); } } @@ -10355,8 +10355,8 @@ build_string ("Synchronous"), Qnil, Qnil); if (STRINGP (value) - && (!strcmp (SDATA (value), "true") - || !strcmp (SDATA (value), "on"))) + && (!strcmp (SSDATA (value), "true") + || !strcmp (SSDATA (value), "on"))) XSynchronize (dpyinfo->display, True); } @@ -10368,13 +10368,13 @@ Qnil, Qnil); #ifdef USE_XIM if (STRINGP (value) - && (!strcmp (SDATA (value), "false") - || !strcmp (SDATA (value), "off"))) + && (!strcmp (SSDATA (value), "false") + || !strcmp (SSDATA (value), "off"))) use_xim = 0; #else if (STRINGP (value) - && (!strcmp (SDATA (value), "true") - || !strcmp (SDATA (value), "on"))) + && (!strcmp (SSDATA (value), "true") + || !strcmp (SSDATA (value), "on"))) use_xim = 1; #endif } ------------------------------------------------------------ revno: 103035 [merge] committer: Paul Eggert branch nick: trunk timestamp: Sun 2011-01-30 11:22:51 -0800 message: Merge: import mktime and move-if-change fixes from gnulib diff: === modified file 'ChangeLog' --- ChangeLog 2011-01-29 12:36:11 +0000 +++ ChangeLog 2011-01-30 19:22:02 +0000 @@ -1,3 +1,102 @@ +2011-01-30 Paul Eggert + + gnulib: import mktime and move-if-change fixes from gnulib + + * configure: Regenerate from the following. + + 2011-01-30 Paul Eggert + + mktime: clarify long_int width checking + * lib/mktime.c (long_int_is_wide_enough): Move this assertion to + the top level, to make it clearer that the assumption about + long_int width is being checked. See + . + + 2011-01-29 Paul Eggert + + TYPE_MAXIMUM: avoid theoretically undefined behavior + * lib/intprops.h (TYPE_MINIMUM, TYPE_MAXIMUM): Do not shift a + negative number, which the C Standard says has undefined behavior. + In practice this is not a problem, but might as well do it by the book. + Reported by Rich Felker and Eric Blake; see + . + * m4/mktime.m4 (AC_FUNC_MKTIME): Likewise. + * lib/mktime.c (TYPE_MAXIMUM): Redo slightly to match the others. + + mktime: #undef mktime before #defining it + * lib/mktime.c (mktime) [DEBUG]: #undef mktime before #defining it. + + mktime: systematically normalize tm_isdst comparisons + * lib/mktime.c (isdst_differ): New function. + (__mktime_internal): Use it systematically for all isdst comparisons. + This completes the fix for libc BZ #6723, and removes the need for + normalizing tm_isdst. See + + (not_equal_tm) [DEBUG]: Use isdst_differ here, too. + + mktime: fix some integer overflow issues and sidestep the rest + + This was prompted by a bug report by Benjamin Lindner for MinGW + . + His bug is due to signed integer overflow (0 - INT_MIN), and I + I scanned through mktime.c looking for other integer overflow + problems, fixing all the bugs I found. + + Although the C Standard says the resulting code is still not safe + in the presence of integer overflow, in practice it should be good + enough for all real-world two's-complement implementations, except + for debugging environments that deliberately trap on integer + overflow (e.g., gcc -ftrapv). + + * lib/mktime.c (WRAPV): New macro. + (SHR): Also check that long_int and time_t shift right in the + usual way, before using the fast-but-unportable method. + (TYPE_ONES_COMPLEMENT, TYPE_SIGNED_MAGNITUDE): Remove, no longer + used. The code already assumed two's complement, so there's + no need to test for alternatives. All uses removed. + (TYPE_MAXIMUM): Don't rely here on overflow behavior not defined by + the C standard. Problem reported by Rich Felker in + . + (twos_complement_arithmetic): Also check long_int and time_t. + (time_t_avg, time_t_add_ok, time_t_int_add_ok): New functions. + (guess_time_tm, ranged_convert, __mktime_internal): Use them. + (__mktime_internal): Avoid integer overflow with unary subtraction + in two instances where -1 - X is an adequate replacement for -X, + since the calculations are approximate. + + 2011-01-29 Eric Blake + + mktime: avoid infinite loop + * m4/mktime.m4 (AC_FUNC_MKTIME): Avoid overflow on possibly-signed + type; behavior is still undefined but portable to all known targets. + Reported by Rich Felker. + + 2011-01-28 Paul Eggert + + mktime: avoid problems on NetBSD 5 / i386 + * lib/mktime.c (long_int): New type. This works around a problem + on NetBSD 5 / i386, where 'long int' and 'int' are both 32 bits + but time_t is 64 bits, and where I expect the existing code is + wrong in some cases. + (leapyear, ydhms_diff, guess_time_tm, __mktime_internal): Use it. + (ydhms_diff): Bring back the compile-time check for wide-enough + year and yday. + + mktime: fix misspelling in comment + * lib/mktime.c (__mktime_internal): Fix misspelling in comment. + This merges all recent glibc changes of importance. + + 2011-01-28 Ralf Wildenhues + + move-if-change: cope with concurrent mv of identical file. + * move-if-change (CMPPROG): Accept environment + variable as an override for `cmp'. + (usage): Document CMPPROG. + Adjust comparison to drop stdout. Cope with failure of mv if + the target file exists and is identical to the source, for + parallel builds. + Report from H.J. Lu against binutils in PR binutils/12283. + 2011-01-29 Eli Zaretskii * lib/makefile.w32-in: === modified file 'configure' --- configure 2011-01-27 07:24:57 +0000 +++ configure 2011-01-30 19:22:02 +0000 @@ -14906,20 +14906,23 @@ int result = 0; time_t t, delta; int i, j; + int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; + int time_t_signed = ! ((time_t) 0 < (time_t) -1); /* This test makes some buggy mktime implementations loop. Give up after 60 seconds; a mktime slower than that isn't worth using anyway. */ alarm (60); - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; + time_t_max = (! time_t_signed + ? (time_t) -1 + : ((((time_t) 1 << (sizeof (time_t) * CHAR_BIT - 2)) - 1) + * 2 + 1)); + time_t_min = (! time_t_signed + ? (time_t) 0 + : time_t_signed_magnitude + ? ~ (time_t) 0 + : ~ time_t_max); delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) === modified file 'lib/intprops.h' --- lib/intprops.h 2011-01-09 01:20:28 +0000 +++ lib/intprops.h 2011-01-30 19:22:02 +0000 @@ -49,11 +49,11 @@ ? (t) 0 \ : TYPE_SIGNED_MAGNITUDE (t) \ ? ~ (t) 0 \ - : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + : ~ TYPE_MAXIMUM (t))) # define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ - : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) /* Return zero if T can be determined to be an unsigned type. Otherwise, return 1. === modified file 'lib/mktime.c' --- lib/mktime.c 2011-01-09 06:57:07 +0000 +++ lib/mktime.c 2011-01-30 19:22:02 +0000 @@ -25,6 +25,24 @@ # include #endif +/* Some of the code in this file assumes that signed integer overflow + silently wraps around. This assumption can't easily be programmed + around, nor can it be checked for portably at compile-time or + easily eliminated at run-time. + + Define WRAPV to 1 if the assumption is valid. Otherwise, define it + to 0; this forces the use of slower code that, while not guaranteed + by the C Standard, works on all production platforms that we know + about. */ +#ifndef WRAPV +# if (__GNUC__ == 4 && 4 <= __GNUC_MINOR__) || 4 < __GNUC__ +# pragma GCC optimize ("wrapv") +# define WRAPV 1 +# else +# define WRAPV 0 +# endif +#endif + /* Assume that leap seconds are possible, unless told otherwise. If the host has a `zic' command with a `-L leapsecondfilename' option, then it supports leap seconds; otherwise it probably doesn't. */ @@ -42,9 +60,21 @@ # include # include /* Make it work even if the system's libc has its own mktime routine. */ +# undef mktime # define mktime my_mktime #endif /* DEBUG */ +/* Verify a requirement at compile-time (unlike assert, which is runtime). */ +#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; } + +/* A signed type that is at least one bit wider than int. */ +#if INT_MAX <= LONG_MAX / 2 +typedef long int long_int; +#else +typedef long long int long_int; +#endif +verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2); + /* Shift A right by B bits portably, by dividing A by 2**B and truncating towards minus infinity. A and B should be free of side effects, and B should be in the range 0 <= B <= INT_BITS - 2, where @@ -55,9 +85,11 @@ implementations (e.g., UNICOS 9.0 on a Cray Y-MP EL) don't shift right in the usual way when A < 0, so SHR falls back on division if ordinary A >> B doesn't seem to be the usual signed shift. */ -#define SHR(a, b) \ - (-1 >> 1 == -1 \ - ? (a) >> (b) \ +#define SHR(a, b) \ + ((-1 >> 1 == -1 \ + && (long_int) -1 >> 1 == -1 \ + && ((time_t) -1 >> 1 == -1 || ! TYPE_SIGNED (time_t))) \ + ? (a) >> (b) \ : (a) / (1 << (b)) - ((a) % (1 << (b)) < 0)) /* The extra casts in the following macros work around compiler bugs, @@ -68,12 +100,8 @@ #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) /* True if negative values of the signed integer type T use two's - complement, ones' complement, or signed magnitude representation, - respectively. Much GNU code assumes two's complement, but some - people like to be portable to all possible C hosts. */ + complement, or if T is an unsigned integer type. */ #define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1) -#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0) -#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1) /* True if the arithmetic type T is signed. */ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) @@ -85,13 +113,11 @@ #define TYPE_MINIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) 0 \ - : TYPE_SIGNED_MAGNITUDE (t) \ - ? ~ (t) 0 \ - : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + : ~ TYPE_MAXIMUM (t))) #define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ - : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) #ifndef TIME_T_MIN # define TIME_T_MIN TYPE_MINIMUM (time_t) @@ -101,14 +127,11 @@ #endif #define TIME_T_MIDPOINT (SHR (TIME_T_MIN + TIME_T_MAX, 1) + 1) -/* Verify a requirement at compile-time (unlike assert, which is runtime). */ -#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; } - verify (time_t_is_integer, TYPE_IS_INTEGER (time_t)); -verify (twos_complement_arithmetic, TYPE_TWOS_COMPLEMENT (int)); -/* The code also assumes that signed integer overflow silently wraps - around, but this assumption can't be stated without causing a - diagnostic on some hosts. */ +verify (twos_complement_arithmetic, + (TYPE_TWOS_COMPLEMENT (int) + && TYPE_TWOS_COMPLEMENT (long_int) + && TYPE_TWOS_COMPLEMENT (time_t))); #define EPOCH_YEAR 1970 #define TM_YEAR_BASE 1900 @@ -116,7 +139,7 @@ /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */ static inline int -leapyear (long int year) +leapyear (long_int year) { /* Don't add YEAR to TM_YEAR_BASE, as that might overflow. Also, work even if YEAR is negative. */ @@ -150,6 +173,14 @@ # include "mktime-internal.h" #endif +/* Return 1 if the values A and B differ according to the rules for + tm_isdst: A and B differ if one is zero and the other positive. */ +static int +isdst_differ (int a, int b) +{ + return (!a != !b) & (0 <= a) & (0 <= b); +} + /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - (YEAR0-YDAY0 HOUR0:MIN0:SEC0) in seconds, assuming that the clocks were not adjusted between the time stamps. @@ -162,15 +193,10 @@ detect overflow. */ static inline time_t -ydhms_diff (long int year1, long int yday1, int hour1, int min1, int sec1, +ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1, int year0, int yday0, int hour0, int min0, int sec0) { verify (C99_integer_division, -1 / 2 == 0); -#if 0 /* This assertion fails on 32-bit systems with 64-bit time_t, such as - NetBSD 5 on i386. */ - verify (long_int_year_and_yday_are_wide_enough, - INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); -#endif /* Compute intervening leap days correctly even if year is negative. Take care to avoid integer overflow here. */ @@ -193,6 +219,53 @@ return seconds; } +/* Return the average of A and B, even if A + B would overflow. */ +static time_t +time_t_avg (time_t a, time_t b) +{ + return SHR (a, 1) + SHR (b, 1) + (a & b & 1); +} + +/* Return 1 if A + B does not overflow. If time_t is unsigned and if + B's top bit is set, assume that the sum represents A - -B, and + return 1 if the subtraction does not wrap around. */ +static int +time_t_add_ok (time_t a, time_t b) +{ + if (! TYPE_SIGNED (time_t)) + { + time_t sum = a + b; + return (sum < a) == (TIME_T_MIDPOINT <= b); + } + else if (WRAPV) + { + time_t sum = a + b; + return (sum < a) == (b < 0); + } + else + { + time_t avg = time_t_avg (a, b); + return TIME_T_MIN / 2 <= avg && avg <= TIME_T_MAX / 2; + } +} + +/* Return 1 if A + B does not overflow. */ +static int +time_t_int_add_ok (time_t a, int b) +{ + verify (int_no_wider_than_time_t, INT_MAX <= TIME_T_MAX); + if (WRAPV) + { + time_t sum = a + b; + return (sum < a) == (b < 0); + } + else + { + int a_odd = a & 1; + time_t avg = SHR (a, 1) + (SHR (b, 1) + (a_odd & b)); + return TIME_T_MIN / 2 <= avg && avg <= TIME_T_MAX / 2; + } +} /* Return a time_t value corresponding to (YEAR-YDAY HOUR:MIN:SEC), assuming that *T corresponds to *TP and that no clock adjustments @@ -201,7 +274,7 @@ If overflow occurs, yield the minimal or maximal value, except do not yield a value equal to *T. */ static time_t -guess_time_tm (long int year, long int yday, int hour, int min, int sec, +guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, const time_t *t, const struct tm *tp) { if (tp) @@ -209,9 +282,8 @@ time_t d = ydhms_diff (year, yday, hour, min, sec, tp->tm_year, tp->tm_yday, tp->tm_hour, tp->tm_min, tp->tm_sec); - time_t t1 = *t + d; - if ((t1 < *t) == (TYPE_SIGNED (time_t) ? d < 0 : TIME_T_MAX / 2 < d)) - return t1; + if (time_t_add_ok (*t, d)) + return *t + d; } /* Overflow occurred one way or another. Return the nearest result @@ -243,9 +315,7 @@ they differ by 1. */ while (bad != ok + (bad < 0 ? -1 : 1)) { - time_t mid = *t = (bad < 0 - ? bad + ((ok - bad) >> 1) - : ok + ((bad - ok) >> 1)); + time_t mid = *t = time_t_avg (ok, bad); r = convert (t, tp); if (r) ok = mid; @@ -294,9 +364,7 @@ int mday = tp->tm_mday; int mon = tp->tm_mon; int year_requested = tp->tm_year; - /* Normalize the value. */ - int isdst = ((tp->tm_isdst >> (8 * sizeof (tp->tm_isdst) - 1)) - | (tp->tm_isdst != 0)); + int isdst = tp->tm_isdst; /* 1 if the previous probe was DST. */ int dst2; @@ -305,8 +373,8 @@ int mon_remainder = mon % 12; int negative_mon_remainder = mon_remainder < 0; int mon_years = mon / 12 - negative_mon_remainder; - long int lyear_requested = year_requested; - long int year = lyear_requested + mon_years; + long_int lyear_requested = year_requested; + long_int year = lyear_requested + mon_years; /* The other values need not be in range: the remaining code handles minor overflows correctly, @@ -318,8 +386,8 @@ int mon_yday = ((__mon_yday[leapyear (year)] [mon_remainder + 12 * negative_mon_remainder]) - 1); - long int lmday = mday; - long int yday = mon_yday + lmday; + long_int lmday = mday; + long_int yday = mon_yday + lmday; time_t guessed_offset = *offset; @@ -373,9 +441,9 @@ int approx_biennia = SHR (t0, ALOG2_SECONDS_PER_BIENNIUM); int diff = approx_biennia - approx_requested_biennia; - int abs_diff = diff < 0 ? - diff : diff; + int abs_diff = diff < 0 ? -1 - diff : diff; - /* IRIX 4.0.5 cc miscaculates TIME_T_MIN / 3: it erroneously + /* IRIX 4.0.5 cc miscalculates TIME_T_MIN / 3: it erroneously gives a positive value of 715827882. Setting a variable first then doing math on it seems to work. (ghazi@caip.rutgers.edu) */ @@ -391,7 +459,7 @@ time_t repaired_t0 = -1 - t0; approx_biennia = SHR (repaired_t0, ALOG2_SECONDS_PER_BIENNIUM); diff = approx_biennia - approx_requested_biennia; - abs_diff = diff < 0 ? - diff : diff; + abs_diff = diff < 0 ? -1 - diff : diff; if (overflow_threshold < abs_diff) return -1; guessed_offset += repaired_t0 - t0; @@ -426,7 +494,7 @@ /* We have a match. Check whether tm.tm_isdst has the requested value, if any. */ - if (isdst != tm.tm_isdst && 0 <= isdst && 0 <= tm.tm_isdst) + if (isdst_differ (isdst, tm.tm_isdst)) { /* tm.tm_isdst has the wrong value. Look for a neighboring time with the right value, and use its UTC offset. @@ -459,22 +527,20 @@ for (delta = stride; delta < delta_bound; delta += stride) for (direction = -1; direction <= 1; direction += 2) - { - time_t ot = t + delta * direction; - if ((ot < t) == (direction < 0)) - { - struct tm otm; - ranged_convert (convert, &ot, &otm); - if (otm.tm_isdst == isdst) - { - /* We found the desired tm_isdst. - Extrapolate back to the desired time. */ - t = guess_time_tm (year, yday, hour, min, sec, &ot, &otm); - ranged_convert (convert, &t, &tm); - goto offset_found; - } - } - } + if (time_t_int_add_ok (t, delta * direction)) + { + time_t ot = t + delta * direction; + struct tm otm; + ranged_convert (convert, &ot, &otm); + if (! isdst_differ (isdst, otm.tm_isdst)) + { + /* We found the desired tm_isdst. + Extrapolate back to the desired time. */ + t = guess_time_tm (year, yday, hour, min, sec, &ot, &otm); + ranged_convert (convert, &t, &tm); + goto offset_found; + } + } } offset_found: @@ -485,11 +551,13 @@ /* Adjust time to reflect the tm_sec requested, not the normalized value. Also, repair any damage from a false match due to a leap second. */ int sec_adjustment = (sec == 0 && tm.tm_sec == 60) - sec; + if (! time_t_int_add_ok (t, sec_requested)) + return -1; t1 = t + sec_requested; + if (! time_t_int_add_ok (t1, sec_adjustment)) + return -1; t2 = t1 + sec_adjustment; - if (((t1 < t) != (sec_requested < 0)) - | ((t2 < t1) != (sec_adjustment < 0)) - | ! convert (&t2, &tm)) + if (! convert (&t2, &tm)) return -1; t = t2; } @@ -540,7 +608,7 @@ | (a->tm_mon ^ b->tm_mon) | (a->tm_year ^ b->tm_year) | (a->tm_yday ^ b->tm_yday) - | (a->tm_isdst ^ b->tm_isdst)); + | isdst_differ (a->tm_isdst, b->tm_isdst)); } static void @@ -664,6 +732,6 @@ /* Local Variables: -compile-command: "gcc -DDEBUG -Wall -W -O -g mktime.c -o mktime" +compile-command: "gcc -DDEBUG -I. -Wall -W -O2 -g mktime.c -o mktime" End: */ === modified file 'm4/mktime.m4' --- m4/mktime.m4 2011-01-09 06:57:07 +0000 +++ m4/mktime.m4 2011-01-30 19:22:02 +0000 @@ -1,4 +1,4 @@ -# serial 17 +# serial 19 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -165,20 +165,23 @@ int result = 0; time_t t, delta; int i, j; + int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; + int time_t_signed = ! ((time_t) 0 < (time_t) -1); /* This test makes some buggy mktime implementations loop. Give up after 60 seconds; a mktime slower than that isn't worth using anyway. */ alarm (60); - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; + time_t_max = (! time_t_signed + ? (time_t) -1 + : ((((time_t) 1 << (sizeof (time_t) * CHAR_BIT - 2)) - 1) + * 2 + 1)); + time_t_min = (! time_t_signed + ? (time_t) 0 + : time_t_signed_magnitude + ? ~ (time_t) 0 + : ~ time_t_max); delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) === modified file 'move-if-change' --- move-if-change 2011-01-07 20:42:11 +0000 +++ move-if-change 2011-01-30 19:22:02 +0000 @@ -2,7 +2,7 @@ # Like mv $1 $2, but if the files are the same, just delete $1. # Status is zero if successful, nonzero otherwise. -VERSION='2007-09-28 23:10'; # UTC +VERSION='2011-01-28 20:09'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -32,15 +32,18 @@ --help display this help and exit --version output version information and exit +The variable CMPPROG can be used to specify an alternative to \`cmp'. + Report bugs to ." version=`expr "$VERSION" : '\([^ ]*\)'` version="move-if-change (gnulib) $version -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law." +cmpprog=${CMPPROG-cmp} for arg do @@ -60,12 +63,15 @@ esac done -test $# = 2 || { echo "$0: $usage" >&2; exit 1; } +test $# -eq 2 || { echo "$0: $usage" >&2; exit 1; } -if test -r "$2" && cmp -s -- "$1" "$2"; then +if test -r "$2" && $cmpprog -- "$1" "$2" >/dev/null; then rm -f -- "$1" else - mv -f -- "$1" "$2" + if mv -f -- "$1" "$2"; then :; else + # Ignore failure due to a concurrent move-if-change. + test -r "$2" && $cmpprog -- "$1" "$2" >/dev/null && rm -f -- "$1" + fi fi ## Local Variables: ------------------------------------------------------------ revno: 103034 committer: Jan D. branch nick: trunk timestamp: Sun 2011-01-30 19:59:58 +0100 message: Implement C-c m in report-emacs-bug (insert to mailer) for OSX. * mail/emacsbug.el (report-emacs-bug-insert-to-mailer): Check report-emacs-bug-can-use-osx-open and use that if t. (report-emacs-bug-can-use-osx-open): New function. (report-emacs-bug): Rename can-xdg-email to can-insert-mail. Check report-emacs-bug-can-use-osx-open also for can-insert-mail. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-29 21:19:21 +0000 +++ lisp/ChangeLog 2011-01-30 18:59:58 +0000 @@ -1,3 +1,11 @@ +2011-01-30 Jan Djärv + + * mail/emacsbug.el (report-emacs-bug-insert-to-mailer): Check + report-emacs-bug-can-use-osx-open and use that if t. + (report-emacs-bug-can-use-osx-open): New function. + (report-emacs-bug): Rename can-xdg-email to can-insert-mail. + Check report-emacs-bug-can-use-osx-open also for can-insert-mail. + 2011-01-29 Chong Yidong * vc/vc-dispatcher.el (vc-set-async-update): New function for === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/emacsbug.el 2011-01-30 18:59:58 +0000 @@ -32,6 +32,8 @@ ;;; Code: +(require 'url-util) + (defgroup emacsbug nil "Sending Emacs bug reports." :group 'maint @@ -77,6 +79,12 @@ (declare-function message-sort-headers "message" ()) (defvar message-strip-special-text-properties) +(defun report-emacs-bug-can-use-osx-open () + "Check if OSX open can be used to insert bug report into mailer" + (and (featurep 'ns) + (equal (executable-find "open") "/usr/bin/open") + (memq system-type '(darwin)))) + (defun report-emacs-bug-can-use-xdg-email () "Check if xdg-email can be used, i.e. we are on Gnome, KDE or xfce4." (and (getenv "DISPLAY") @@ -116,10 +124,15 @@ (if (> (point-max) (point)) (buffer-substring-no-properties (point) (point-max)))))) (if (and to subject body) - (start-process "xdg-email" nil "xdg-email" - "--subject" subject - "--body" body - (concat "mailto:" to)) + (if (report-emacs-bug-can-use-osx-open) + (start-process "/usr/bin/open" nil "open" + (concat "mailto:" to + "?subject=" (url-hexify-string subject) + "&body=" (url-hexify-string body))) + (start-process "xdg-email" nil "xdg-email" + "--subject" subject + "--body" body + (concat "mailto:" to))) (error "Subject, To or body not found"))))) ;;;###autoload @@ -141,7 +154,8 @@ (prompt-properties '(field emacsbug-prompt intangible but-helpful rear-nonsticky t)) - (can-xdg-email (report-emacs-bug-can-use-xdg-email)) + (can-insert-mail (or (report-emacs-bug-can-use-xdg-email) + (report-emacs-bug-can-use-osx-open))) user-point message-end-point) (setq message-end-point (with-current-buffer (get-buffer-create "*Messages*") @@ -275,7 +289,7 @@ ;; This is so the user has to type something in order to send easily. (use-local-map (nconc (make-sparse-keymap) (current-local-map))) (define-key (current-local-map) "\C-c\C-i" 'report-emacs-bug-info) - (if can-xdg-email + (if can-insert-mail (define-key (current-local-map) "\C-cm" 'report-emacs-bug-insert-to-mailer)) (setq report-emacs-bug-send-command (get mail-user-agent 'sendfunc) @@ -292,7 +306,7 @@ report-emacs-bug-send-command)))) (princ (substitute-command-keys " Type \\[kill-buffer] RET to cancel (don't send it).\n")) - (if can-xdg-email + (if can-insert-mail (princ (substitute-command-keys " Type \\[report-emacs-bug-insert-to-mailer] to insert text to you preferred mail program.\n"))) (terpri) ------------------------------------------------------------ revno: 103033 committer: Jan D. branch nick: trunk timestamp: Sun 2011-01-30 19:36:12 +0100 message: * .gdbinit: Read global lisp variables as globals.f_V*. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2011-01-25 04:08:28 +0000 +++ src/.gdbinit 2011-01-30 18:36:12 +0000 @@ -1315,7 +1315,7 @@ show environment TERM # People get bothered when they see messages about non-existent functions... -xgetptr Vsystem_type +xgetptr globals.f_Vsystem_type # $ptr is NULL in temacs if ($ptr != 0) set $tem = (struct Lisp_Symbol *) $ptr @@ -1340,7 +1340,7 @@ tbreak init_sys_modes commands silent - xgetptr Vinitial_window_system + xgetptr globals.f_Vinitial_window_system set $tem = (struct Lisp_Symbol *) $ptr xgetptr $tem->xname set $tem = (struct Lisp_String *) $ptr === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-30 00:35:35 +0000 +++ src/ChangeLog 2011-01-30 18:36:12 +0000 @@ -1,3 +1,7 @@ +2011-01-30 Jan Djärv + + * .gdbinit: Read global lisp variables as globals.f_V*. + 2011-01-30 Andreas Schwab * font.c (PROP_MATCH): Remove parameter N and use strlen instead. ------------------------------------------------------------ revno: 103032 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2011-01-30 12:58:09 +0100 message: Regenerate ldefs-boot.el diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-01-15 20:38:27 +0000 +++ lisp/ldefs-boot.el 2011-01-30 11:58:09 +0000 @@ -5,7 +5,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (19634 23255)) +;;;;;; "play/5x5.el" (19775 2029)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -65,7 +65,7 @@ ;;;*** ;;;### (autoloads (list-one-abbrev-table) "abbrevlist" "abbrevlist.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2027)) ;;; Generated autoloads from abbrevlist.el (autoload 'list-one-abbrev-table "abbrevlist" "\ @@ -76,7 +76,7 @@ ;;;*** ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el" -;;;;;; (19672 56753)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -90,14 +90,13 @@ (autoload 'ada-mode "ada-mode" "\ Ada mode is the major mode for editing Ada code. -\\{ada-mode-map} \(fn)" t nil) ;;;*** ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el" -;;;;;; (19580 19536)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload 'ada-header "ada-stmt" "\ @@ -108,7 +107,7 @@ ;;;*** ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el" -;;;;;; (19672 41738)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -123,7 +122,7 @@ ;;;;;; add-change-log-entry-other-window add-change-log-entry find-change-log ;;;;;; prompt-for-change-log-name add-log-mailing-address add-log-full-name ;;;;;; add-log-current-defun-function) "add-log" "vc/add-log.el" -;;;;;; (19661 46305)) +;;;;;; (19775 2030)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -262,7 +261,7 @@ ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice ;;;;;; ad-enable-advice ad-default-compilation-action ad-redefinition-action) -;;;;;; "advice" "emacs-lisp/advice.el" (19580 19536)) +;;;;;; "advice" "emacs-lisp/advice.el" (19780 4513)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -407,7 +406,7 @@ ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (19574 61126)) +;;;;;; align) "align" "align.el" (19775 2027)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -497,7 +496,7 @@ ;;;*** ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el" -;;;;;; (19696 28661)) +;;;;;; (19775 2027)) ;;; Generated autoloads from allout.el (put 'allout-use-hanging-indents 'safe-local-variable (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) @@ -534,18 +533,16 @@ (autoload 'allout-mode "allout" "\ Toggle minor mode for controlling exposure and editing of text outlines. -\\ - -Optional prefix argument TOGGLE forces the mode to re-initialize -if it is positive, otherwise it turns the mode off. Allout -outline mode always runs as a minor mode. - -Allout outline mode provides extensive outline oriented formatting and -manipulation. It enables structural editing of outlines, as well as -navigation and exposure. It also is specifically aimed at -accommodating syntax-sensitive text like programming languages. (For -an example, see the allout code itself, which is organized as an allout -outline.) +\\ + +Allout outline mode always runs as a minor mode. + +Allout outline mode provides extensive outline oriented +formatting and manipulation. It enables structural editing of +outlines, as well as navigation and exposure. It also is +specifically aimed at accommodating syntax-sensitive text like +programming languages. (For example, see the allout code itself, +which is organized as an allout outline.) In addition to typical outline navigation and exposure, allout includes: @@ -553,27 +550,30 @@ repositioning, promotion/demotion, cut, and paste - incremental search with dynamic exposure and reconcealment of hidden text - adjustable format, so programming code can be developed in outline-structure - - easy topic encryption and decryption + - easy topic encryption and decryption, symmetric or key-pair - \"Hot-spot\" operation, for single-keystroke maneuvering and exposure control - integral outline layout, for automatic initial exposure when visiting a file - independent extensibility, using comprehensive exposure and authoring hooks and many other features. -Below is a description of the key bindings, and then explanation of -special `allout-mode' features and terminology. See also the outline -menubar additions for quick reference to many of the features, and see -the docstring of the function `allout-init' for instructions on -priming your emacs session for automatic activation of `allout-mode'. +Below is a description of the key bindings, and then description +of special `allout-mode' features and terminology. See also the +outline menubar additions for quick reference to many of the +features, and see the docstring of the function `allout-init' for +instructions on priming your emacs session for automatic +activation of `allout-mode'. -The bindings are dictated by the customizable `allout-keybindings-list' -variable. We recommend customizing `allout-command-prefix' to use just -`\\C-c' as the command prefix, if the allout bindings don't conflict with -any personal bindings you have on \\C-c. In any case, outline structure -navigation and authoring is simplified by positioning the cursor on an -item's bullet character, the \"hot-spot\" -- then you can invoke allout -commands with just the un-prefixed, un-control-shifted command letters. -This is described further in the HOT-SPOT Operation section. +The bindings are those listed in `allout-prefixed-keybindings' +and `allout-unprefixed-keybindings'. We recommend customizing +`allout-command-prefix' to use just `\\C-c' as the command +prefix, if the allout bindings don't conflict with any personal +bindings you have on \\C-c. In any case, outline structure +navigation and authoring is simplified by positioning the cursor +on an item's bullet character, the \"hot-spot\" -- then you can +invoke allout commands with just the un-prefixed, +un-control-shifted command letters. This is described further in +the HOT-SPOT Operation section. Exposure Control: ---------------- @@ -652,19 +652,22 @@ Topic Encryption Outline mode supports gpg encryption of topics, with support for -symmetric and key-pair modes, passphrase timeout, passphrase -consistency checking, user-provided hinting for symmetric key -mode, and auto-encryption of topics pending encryption on save. +symmetric and key-pair modes, and auto-encryption of topics +pending encryption on save. Topics pending encryption are, by default, automatically -encrypted during file saves. If the contents of the topic -containing the cursor was encrypted for a save, it is -automatically decrypted for continued editing. +encrypted during file saves, including checkpoint saves, to avoid +exposing the plain text of encrypted topics in the file system. +If the content of the topic containing the cursor was encrypted +for a save, it is automatically decrypted for continued editing. -The aim of these measures is reliable topic privacy while -preventing accidents like neglected encryption before saves, -forgetting which passphrase was used, and other practical -pitfalls. +NOTE: A few GnuPG v2 versions improperly preserve incorrect +symmetric decryption keys, preventing entry of the correct key on +subsequent decryption attempts until the cache times-out. That +can take several minutes. (Decryption of other entries is not +affected.) Upgrade your EasyPG version, if you can, and you can +deliberately clear your gpg-agent's cache by sending it a '-HUP' +signal. See `allout-toggle-current-subtree-encryption' function docstring and `allout-encrypt-unencrypted-on-saves' customization variable @@ -702,7 +705,8 @@ without changes to the allout core. Here are key ones: `allout-mode-hook' -`allout-mode-deactivate-hook' +`allout-mode-deactivate-hook' (deprecated) +`allout-mode-off-hook' `allout-exposure-change-hook' `allout-structure-added-hook' `allout-structure-deleted-hook' @@ -789,7 +793,7 @@ CLOSED: A TOPIC whose immediate OFFSPRING and body-text is CONCEALED. OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be. -\(fn &optional TOGGLE)" t nil) +\(fn &optional ARG)" t nil) (defalias 'outlinify-sticky 'outlineify-sticky) @@ -804,7 +808,7 @@ ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (19668 18649)) +;;;;;; "net/ange-ftp.el" (19780 4514)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -826,7 +830,7 @@ ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) -;;;;;; "animate" "play/animate.el" (19277 34922)) +;;;;;; "animate" "play/animate.el" (19775 2029)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -854,7 +858,7 @@ ;;;*** ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on) -;;;;;; "ansi-color" "ansi-color.el" (19594 48841)) +;;;;;; "ansi-color" "ansi-color.el" (19775 2027)) ;;; Generated autoloads from ansi-color.el (autoload 'ansi-color-for-comint-mode-on "ansi-color" "\ @@ -880,7 +884,7 @@ ;;;*** ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules) -;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (19599 45674)) +;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (19775 2029)) ;;; Generated autoloads from progmodes/antlr-mode.el (autoload 'antlr-show-makefile-rules "antlr-mode" "\ @@ -904,7 +908,6 @@ (autoload 'antlr-mode "antlr-mode" "\ Major mode for editing ANTLR grammar files. -\\{antlr-mode-map} \(fn)" t nil) @@ -917,7 +920,7 @@ ;;;*** ;;;### (autoloads (appt-activate appt-add) "appt" "calendar/appt.el" -;;;;;; (19628 54816)) +;;;;;; (19780 4513)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -940,7 +943,7 @@ ;;;### (autoloads (apropos-documentation apropos-value apropos-library ;;;;;; apropos apropos-documentation-property apropos-command apropos-variable -;;;;;; apropos-read-pattern) "apropos" "apropos.el" (19580 19536)) +;;;;;; apropos-read-pattern) "apropos" "apropos.el" (19775 2027)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1043,8 +1046,8 @@ ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19668 -;;;;;; 19473)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19775 +;;;;;; 2027)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1064,7 +1067,7 @@ ;;;*** -;;;### (autoloads (array-mode) "array" "array.el" (19672 56753)) +;;;### (autoloads (array-mode) "array" "array.el" (19775 2027)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1135,8 +1138,8 @@ ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19623 -;;;;;; 59989)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from textmodes/artist.el (autoload 'artist-mode "artist" "\ @@ -1342,8 +1345,8 @@ ;;;*** -;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19439 -;;;;;; 4022)) +;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1371,7 +1374,7 @@ ;;;*** ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el" -;;;;;; (19277 34915)) +;;;;;; (19775 2027)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1425,7 +1428,7 @@ ;;;*** ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el" -;;;;;; (19594 48841)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1436,7 +1439,7 @@ ;;;*** ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert) -;;;;;; "autoinsert" "autoinsert.el" (19508 78)) +;;;;;; "autoinsert" "autoinsert.el" (19780 4512)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1475,7 +1478,7 @@ ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (19687 6902)) +;;;;;; (19780 4513)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1514,7 +1517,7 @@ ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (19277 34915)) +;;;;;; "autorevert" "autorevert.el" (19775 2027)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1595,7 +1598,7 @@ ;;;*** ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid" -;;;;;; "avoid.el" (19645 60484)) +;;;;;; "avoid.el" (19775 2027)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1636,7 +1639,7 @@ ;;;*** ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el" -;;;;;; (19277 34915)) +;;;;;; (19775 2027)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1668,7 +1671,7 @@ ;;;*** ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run) -;;;;;; "benchmark" "emacs-lisp/benchmark.el" (19277 34919)) +;;;;;; "benchmark" "emacs-lisp/benchmark.el" (19780 4513)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1701,7 +1704,7 @@ ;;;*** ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize) -;;;;;; "bibtex" "textmodes/bibtex.el" (19661 46305)) +;;;;;; "bibtex" "textmodes/bibtex.el" (19780 4514)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1788,7 +1791,7 @@ ;;;*** ;;;### (autoloads (bibtex-style-mode) "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (19611 36358)) +;;;;;; (19780 4514)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1800,7 +1803,7 @@ ;;;### (autoloads (binhex-decode-region binhex-decode-region-external ;;;;;; binhex-decode-region-internal) "binhex" "mail/binhex.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2028)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$") @@ -1823,8 +1826,8 @@ ;;;*** -;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (19277 -;;;;;; 34922)) +;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -1947,7 +1950,7 @@ ;;;;;; bookmark-save bookmark-write bookmark-delete bookmark-insert ;;;;;; bookmark-rename bookmark-insert-location bookmark-relocate ;;;;;; bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark" -;;;;;; "bookmark.el" (19668 18952)) +;;;;;; "bookmark.el" (19780 4512)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2000,8 +2003,8 @@ will then jump to the new location, as well as recording it in place of the old one in the permanent bookmark record. -BOOKMARK may be a bookmark name (a string) or a bookmark record, but -the latter is usually only used by programmatic callers. +BOOKMARK is usually a bookmark name (a string). It can also be a +bookmark record, but this is usually only done by programmatic callers. If DISPLAY-FUNC is non-nil, it is a function to invoke to display the bookmark. It defaults to `switch-to-buffer'. A typical value for @@ -2015,57 +2018,52 @@ \(fn BOOKMARK)" t nil) (autoload 'bookmark-relocate "bookmark" "\ -Relocate BOOKMARK to another file (reading file name with minibuffer). -BOOKMARK is a bookmark name (a string), not a bookmark record. +Relocate BOOKMARK-NAME to another file, reading file name with minibuffer. This makes an already existing bookmark point to that file, instead of the one it used to point at. Useful when a file has been renamed after a bookmark was set in it. -\(fn BOOKMARK)" t nil) +\(fn BOOKMARK-NAME)" t nil) (autoload 'bookmark-insert-location "bookmark" "\ -Insert the name of the file associated with BOOKMARK. -BOOKMARK is a bookmark name (a string), not a bookmark record. +Insert the name of the file associated with BOOKMARK-NAME. Optional second arg NO-HISTORY means don't record this in the minibuffer history list `bookmark-history'. -\(fn BOOKMARK &optional NO-HISTORY)" t nil) +\(fn BOOKMARK-NAME &optional NO-HISTORY)" t nil) (defalias 'bookmark-locate 'bookmark-insert-location) (autoload 'bookmark-rename "bookmark" "\ -Change the name of OLD bookmark to NEW name. -If called from keyboard, prompt for OLD and NEW. If called from -menubar, select OLD from a menu and prompt for NEW. - -Both OLD and NEW are bookmark names (strings), never bookmark records. - -If called from Lisp, prompt for NEW if only OLD was passed as an -argument. If called with two strings, then no prompting is done. You -must pass at least OLD when calling from Lisp. +Change the name of OLD-NAME bookmark to NEW-NAME name. +If called from keyboard, prompt for OLD-NAME and NEW-NAME. +If called from menubar, select OLD-NAME from a menu and prompt for NEW-NAME. + +If called from Lisp, prompt for NEW-NAME if only OLD-NAME was passed +as an argument. If called with two strings, then no prompting is done. +You must pass at least OLD-NAME when calling from Lisp. While you are entering the new name, consecutive C-w's insert consecutive words from the text of the buffer into the new bookmark name. -\(fn OLD &optional NEW)" t nil) +\(fn OLD-NAME &optional NEW-NAME)" t nil) (autoload 'bookmark-insert "bookmark" "\ -Insert the text of the file pointed to by bookmark BOOKMARK. -BOOKMARK is a bookmark name (a string), not a bookmark record. +Insert the text of the file pointed to by bookmark BOOKMARK-NAME. +BOOKMARK-NAME is a bookmark name (a string), not a bookmark record. You may have a problem using this function if the value of variable `bookmark-alist' is nil. If that happens, you need to load in some bookmarks. See help on function `bookmark-load' for more about this. -\(fn BOOKMARK)" t nil) +\(fn BOOKMARK-NAME)" t nil) (autoload 'bookmark-delete "bookmark" "\ -Delete BOOKMARK from the bookmark list. -BOOKMARK is a bookmark name (a string), not a bookmark record. +Delete BOOKMARK-NAME from the bookmark list. Removes only the first instance of a bookmark with that name. If there are one or more other bookmarks with the same name, they will @@ -2074,7 +2072,7 @@ Optional second arg BATCH means don't update the bookmark list buffer, probably because we were called from there. -\(fn BOOKMARK &optional BATCH)" t nil) +\(fn BOOKMARK-NAME &optional BATCH)" t nil) (autoload 'bookmark-write "bookmark" "\ Write bookmarks to a file (reading the file name with the minibuffer). @@ -2150,11 +2148,10 @@ ;;;;;; browse-url-w3-gnudoit browse-url-w3 browse-url-cci browse-url-mosaic ;;;;;; browse-url-gnome-moz browse-url-emacs browse-url-galeon browse-url-firefox ;;;;;; browse-url-mozilla browse-url-netscape browse-url-xdg-open -;;;;;; browse-url-default-browser browse-url-at-mouse browse-url-at-point -;;;;;; browse-url browse-url-of-region browse-url-of-dired-file -;;;;;; browse-url-of-buffer browse-url-of-file browse-url-url-at-point +;;;;;; browse-url-at-mouse browse-url-at-point browse-url browse-url-of-region +;;;;;; browse-url-of-dired-file browse-url-of-buffer browse-url-of-file ;;;;;; browse-url-browser-function) "browse-url" "net/browse-url.el" -;;;;;; (19696 28661)) +;;;;;; (19780 4514)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function (cond ((memq system-type '(windows-nt ms-dos cygwin)) 'browse-url-default-windows-browser) ((memq system-type '(darwin)) 'browse-url-default-macosx-browser) (t 'browse-url-default-browser)) "\ @@ -2170,11 +2167,6 @@ (custom-autoload 'browse-url-browser-function "browse-url" t) -(autoload 'browse-url-url-at-point "browse-url" "\ -Not documented - -\(fn)" nil nil) - (autoload 'browse-url-of-file "browse-url" "\ Ask a WWW browser to display FILE. Display the current buffer's file if FILE is nil or if called @@ -2227,23 +2219,6 @@ \(fn EVENT)" t nil) -(autoload 'browse-url-default-browser "browse-url" "\ -Find a suitable browser and ask it to load URL. -Default to the URL around or before point. - -When called interactively, if variable `browse-url-new-window-flag' is -non-nil, load the document in a new window, if possible, otherwise use -a random existing one. A non-nil interactive prefix argument reverses -the effect of `browse-url-new-window-flag'. - -When called non-interactively, optional second argument NEW-WINDOW is -used instead of `browse-url-new-window-flag'. - -The order attempted is gnome-moz-remote, Mozilla, Firefox, -Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3. - -\(fn URL &rest ARGS)" nil nil) - (autoload 'browse-url-xdg-open "browse-url" "\ Not documented @@ -2481,8 +2456,8 @@ ;;;*** -;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (19277 -;;;;;; 34922)) +;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from play/bruce.el (autoload 'bruce "bruce" "\ @@ -2498,7 +2473,7 @@ ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (19515 27412)) +;;;;;; "bs" "bs.el" (19775 2027)) ;;; Generated autoloads from bs.el (autoload 'bs-cycle-next "bs" "\ @@ -2538,7 +2513,7 @@ ;;;*** -;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (19612 4032)) +;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (19775 2029)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2559,8 +2534,26 @@ ;;;*** +;;;### (autoloads (list-buffers) "buff-menu" "buff-menu.el" (19775 +;;;;;; 2027)) +;;; Generated autoloads from buff-menu.el + +(define-key ctl-x-map "" 'list-buffers) + +(autoload 'list-buffers "buff-menu" "\ +Display a list of names of existing buffers. +The list is displayed in a buffer named `*Buffer List*'. +Note that buffers with names starting with spaces are omitted. +Non-null optional arg FILES-ONLY means mention only file buffers. + +For more information, see the function `buffer-menu'. + +\(fn &optional FILES-ONLY)" t nil) + +;;;*** + ;;;### (autoloads (bug-reference-prog-mode bug-reference-mode) "bug-reference" -;;;;;; "progmodes/bug-reference.el" (19418 12890)) +;;;;;; "progmodes/bug-reference.el" (19775 2029)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2581,7 +2574,7 @@ ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) -;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (19687 6902)) +;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2701,8 +2694,8 @@ ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19580 -;;;;;; 19536)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19775 +;;;;;; 2027)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2711,7 +2704,7 @@ ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19580 19536)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19775 2027)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2723,7 +2716,7 @@ ;;;*** ;;;### (autoloads (calendar-hebrew-list-yahrzeits) "cal-hebrew" "calendar/cal-hebrew.el" -;;;;;; (19631 54972)) +;;;;;; (19775 2027)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2739,8 +2732,8 @@ ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc -;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (19552 -;;;;;; 37739)) +;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (19775 +;;;;;; 2027)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2824,8 +2817,19 @@ ;;;*** -;;;### (autoloads (calculator) "calculator" "calculator.el" (19612 -;;;;;; 4032)) +;;;### (autoloads (calc-undo) "calc-undo" "calc/calc-undo.el" (19775 +;;;;;; 2027)) +;;; Generated autoloads from calc/calc-undo.el + +(autoload 'calc-undo "calc-undo" "\ +Not documented + +\(fn N)" t nil) + +;;;*** + +;;;### (autoloads (calculator) "calculator" "calculator.el" (19775 +;;;;;; 2027)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2836,8 +2840,8 @@ ;;;*** -;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19687 -;;;;;; 6902)) +;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -2881,7 +2885,7 @@ ;;;*** ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock" -;;;;;; "gnus/canlock.el" (19582 65302)) +;;;;;; "gnus/canlock.el" (19775 2028)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -2899,7 +2903,7 @@ ;;;*** ;;;### (autoloads (capitalized-words-mode) "cap-words" "progmodes/cap-words.el" -;;;;;; (19277 34922)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/cap-words.el (autoload 'capitalized-words-mode "cap-words" "\ @@ -2934,15 +2938,15 @@ ;;;*** -;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (19580 -;;;;;; 19536)) +;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from progmodes/cc-compat.el (put 'c-indent-level 'safe-local-variable 'integerp) ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (19632 52521)) +;;;;;; (19780 45051)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -2954,7 +2958,7 @@ ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (19646 27154)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3114,7 +3118,7 @@ ;;;*** ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles" -;;;;;; "progmodes/cc-styles.el" (19623 58121)) +;;;;;; "progmodes/cc-styles.el" (19780 4514)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3165,7 +3169,7 @@ ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (19580 19536)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (19780 4514)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3175,7 +3179,7 @@ ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program ;;;;;; declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el" -;;;;;; (19639 17158)) +;;;;;; (19775 2028)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3436,7 +3440,7 @@ ;;;*** ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el" -;;;;;; (19594 48841)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/cfengine.el (autoload 'cfengine-mode "cfengine" "\ @@ -3451,7 +3455,7 @@ ;;;*** ;;;### (autoloads (check-declare-directory check-declare-file) "check-declare" -;;;;;; "emacs-lisp/check-declare.el" (19277 34919)) +;;;;;; "emacs-lisp/check-declare.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3476,7 +3480,7 @@ ;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer ;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive ;;;;;; checkdoc-interactive checkdoc checkdoc-list-of-strings-p) -;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (19687 6902)) +;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp) (put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp) @@ -3671,7 +3675,7 @@ ;;;### (autoloads (pre-write-encode-hz post-read-decode-hz encode-hz-buffer ;;;;;; encode-hz-region decode-hz-buffer decode-hz-region) "china-util" -;;;;;; "language/china-util.el" (19277 34920)) +;;;;;; "language/china-util.el" (19780 4513)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -3709,7 +3713,7 @@ ;;;*** ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command) -;;;;;; "chistory" "chistory.el" (19277 34915)) +;;;;;; "chistory" "chistory.el" (19775 2027)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -3748,7 +3752,7 @@ ;;;*** -;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (19627 57387)) +;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/cl.el (defvar custom-print-functions nil "\ @@ -3764,7 +3768,7 @@ ;;;*** ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -3843,7 +3847,7 @@ ;;;*** ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el" -;;;;;; (19277 34922)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -3863,8 +3867,8 @@ ;;;*** -;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (19277 -;;;;;; 34915)) +;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (19775 +;;;;;; 2027)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -3888,7 +3892,7 @@ ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (19687 6902)) +;;;;;; (19775 2027)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -3983,7 +3987,7 @@ ;;;*** ;;;### (autoloads (compare-windows) "compare-w" "vc/compare-w.el" -;;;;;; (19478 62344)) +;;;;;; (19780 4514)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4020,8 +4024,8 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook -;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19656 -;;;;;; 61992)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4048,9 +4052,7 @@ *Function to call to customize the compilation process. This function is called immediately before the compilation process is started. It can be used to set any variables or functions that are used -while processing the output of the compilation process. The function -is called with variables `compilation-buffer' and `compilation-window' -bound to the compilation buffer and window, respectively.") +while processing the output of the compilation process.") (defvar compilation-buffer-name-function nil "\ Function to compute the name of a compilation buffer. @@ -4197,7 +4199,7 @@ ;;;*** ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el" -;;;;;; (19277 34915)) +;;;;;; (19780 4513)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4216,10 +4218,46 @@ ;;;*** +;;;### (autoloads (global-auto-composition-mode auto-composition-mode +;;;;;; encode-composition-rule) "composite" "composite.el" (19760 +;;;;;; 54262)) +;;; Generated autoloads from composite.el + +(autoload 'encode-composition-rule "composite" "\ +Encode composition rule RULE into an integer value. +RULE is a cons of global and new reference point symbols +\(see `reference-point-alist'). + +\(fn RULE)" nil nil) + +(autoload 'auto-composition-mode "composite" "\ +Toggle Auto Composition mode. +With ARG, turn Auto Composition mode off if and only if ARG is a non-positive +number; if ARG is nil, toggle Auto Composition mode; anything else turns Auto +Composition on. + +When Auto Composition is enabled, text characters are automatically composed +by functions registered in `composition-function-table' (which see). + +You can use `global-auto-composition-mode' to turn on +Auto Composition mode in all buffers (this is the default). + +\(fn &optional ARG)" t nil) + +(autoload 'global-auto-composition-mode "composite" "\ +Toggle Auto-Composition mode in every possible buffer. +With prefix arg, turn Global-Auto-Composition mode on if and only if arg +is positive. +See `auto-composition-mode' for more information on Auto-Composition mode. + +\(fn &optional ARG)" t nil) + +;;;*** + ;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode ;;;;;; conf-space-keywords conf-space-mode conf-javaprop-mode conf-windows-mode ;;;;;; conf-unix-mode conf-mode) "conf-mode" "textmodes/conf-mode.el" -;;;;;; (19277 34923)) +;;;;;; (19780 4514)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4375,7 +4413,7 @@ ;;;*** ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie) -;;;;;; "cookie1" "play/cookie1.el" (19583 60940)) +;;;;;; "cookie1" "play/cookie1.el" (19775 2029)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4407,9 +4445,12 @@ ;;;*** ;;;### (autoloads (copyright-update-directory copyright copyright-fix-years -;;;;;; copyright-update) "copyright" "emacs-lisp/copyright.el" (19561 -;;;;;; 48711)) +;;;;;; copyright-update) "copyright" "emacs-lisp/copyright.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from emacs-lisp/copyright.el +(put 'copyright-at-end-flag 'safe-local-variable 'booleanp) +(put 'copyright-names-regexp 'safe-local-variable 'stringp) +(put 'copyright-year-ranges 'safe-local-variable 'booleanp) (autoload 'copyright-update "copyright" "\ Update copyright notice to indicate the current year. @@ -4425,6 +4466,8 @@ (autoload 'copyright-fix-years "copyright" "\ Convert 2 digit years to 4 digit years. Uses heuristic: year >= 50 means 19xx, < 50 means 20xx. +If `copyright-year-ranges' (which see) is non-nil, also +independently replaces consecutive years with a range. \(fn)" t nil) @@ -4435,13 +4478,14 @@ (autoload 'copyright-update-directory "copyright" "\ Update copyright notice for all files in DIRECTORY matching MATCH. +If FIX is non-nil, run `copyright-fix-years' instead. -\(fn DIRECTORY MATCH)" t nil) +\(fn DIRECTORY MATCH &optional FIX)" t nil) ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (19672 56753)) +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (19775 2029)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4640,7 +4684,7 @@ ;;;*** ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el" -;;;;;; (19277 34922)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4659,7 +4703,7 @@ ;;;*** ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el" -;;;;;; (19609 2266)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emulation/crisp.el (defvar crisp-mode nil "\ @@ -4683,7 +4727,7 @@ ;;;*** ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -4718,8 +4762,8 @@ ;;;*** -;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (19611 -;;;;;; 35698)) +;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -4730,7 +4774,7 @@ ;;;*** ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el" -;;;;;; (19648 63621)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -4789,7 +4833,7 @@ ;;;;;; customize-mode customize customize-save-variable customize-set-variable ;;;;;; customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically ;;;;;; custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el" -;;;;;; (19645 60484)) +;;;;;; (19775 2027)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5092,7 +5136,7 @@ ;;;*** ;;;### (autoloads (customize-themes describe-theme customize-create-theme) -;;;;;; "cus-theme" "cus-theme.el" (19645 60484)) +;;;;;; "cus-theme" "cus-theme.el" (19775 2028)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5119,7 +5163,7 @@ ;;;*** ;;;### (autoloads (cvs-status-mode) "cvs-status" "vc/cvs-status.el" -;;;;;; (19474 36901)) +;;;;;; (19775 2030)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5130,7 +5174,7 @@ ;;;*** ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode) -;;;;;; "cwarn" "progmodes/cwarn.el" (19580 19536)) +;;;;;; "cwarn" "progmodes/cwarn.el" (19780 4514)) ;;; Generated autoloads from progmodes/cwarn.el (autoload 'cwarn-mode "cwarn" "\ @@ -5177,7 +5221,7 @@ ;;;### (autoloads (standard-display-cyrillic-translit cyrillic-encode-alternativnyj-char ;;;;;; cyrillic-encode-koi8-r-char) "cyril-util" "language/cyril-util.el" -;;;;;; (19277 34920)) +;;;;;; (19775 2028)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5206,7 +5250,7 @@ ;;;*** ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el" -;;;;;; (19552 37739)) +;;;;;; (19775 2028)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5253,7 +5297,7 @@ ;;;*** ;;;### (autoloads (data-debug-new-buffer) "data-debug" "cedet/data-debug.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2027)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5263,8 +5307,8 @@ ;;;*** -;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (19664 -;;;;;; 56235)) +;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5277,8 +5321,8 @@ ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (19668 -;;;;;; 19168)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5405,7 +5449,7 @@ ;;;*** ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug" -;;;;;; "emacs-lisp/debug.el" (19580 19536)) +;;;;;; "emacs-lisp/debug.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5449,7 +5493,7 @@ ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (19670 666)) +;;;;;; (19775 2029)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5478,8 +5522,8 @@ ;;;*** ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region -;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (19324 -;;;;;; 55755)) +;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from delim-col.el (autoload 'delimit-columns-customize "delim-col" "\ @@ -5503,8 +5547,8 @@ ;;;*** -;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19519 -;;;;;; 16431)) +;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from progmodes/delphi.el (autoload 'delphi-mode "delphi" "\ @@ -5555,8 +5599,8 @@ ;;;*** -;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (19277 -;;;;;; 34915)) +;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5585,7 +5629,7 @@ ;;;*** ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode) -;;;;;; "derived" "emacs-lisp/derived.el" (19580 19536)) +;;;;;; "derived" "emacs-lisp/derived.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5652,7 +5696,7 @@ ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (19515 27412)) +;;;;;; "descr-text.el" (19775 2028)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5680,7 +5724,7 @@ ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-remove desktop-save ;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop" -;;;;;; "desktop.el" (19590 30214)) +;;;;;; "desktop.el" (19780 4513)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -5864,7 +5908,7 @@ ;;;### (autoloads (gnus-article-outlook-deuglify-article gnus-outlook-deuglify-article ;;;;;; gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines) -;;;;;; "deuglify" "gnus/deuglify.el" (19582 65302)) +;;;;;; "deuglify" "gnus/deuglify.el" (19780 4513)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -5897,7 +5941,7 @@ ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (19696 27153)) +;;;;;; "calendar/diary-lib.el" (19775 2027)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -5940,7 +5984,7 @@ ;;;*** ;;;### (autoloads (diff-buffer-with-file diff-backup diff diff-command -;;;;;; diff-switches) "diff" "vc/diff.el" (19695 9667)) +;;;;;; diff-switches) "diff" "vc/diff.el" (19775 2030)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -5984,7 +6028,7 @@ ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el" -;;;;;; (19552 37739)) +;;;;;; (19775 2030)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6012,7 +6056,7 @@ ;;;*** -;;;### (autoloads (dig) "dig" "net/dig.el" (19634 23255)) +;;;### (autoloads (dig) "dig" "net/dig.el" (19775 2029)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6023,9 +6067,8 @@ ;;;*** -;;;### (autoloads (dired-mode dired-auto-revert-buffer dired-noselect -;;;;;; dired-other-frame dired-other-window dired dired-trivial-filenames -;;;;;; dired-listing-switches) "dired" "dired.el" (19673 45510)) +;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window +;;;;;; dired dired-listing-switches) "dired" "dired.el" (19780 4513)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6039,16 +6082,6 @@ (custom-autoload 'dired-listing-switches "dired" t) -(defvar dired-chown-program (purecopy (if (memq system-type '(hpux usg-unix-v irix gnu/linux cygwin)) "chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" "/etc/chown"))) "\ -Name of chown command (usually `chown' or `/etc/chown').") - -(defvar dired-trivial-filenames (purecopy "^\\.\\.?$\\|^#") "\ -Regexp of files to skip when finding first file of a directory. -A value of nil means move to the subdir line. -A value of t means move to first file.") - -(custom-autoload 'dired-trivial-filenames "dired" t) - (defvar dired-directory nil "\ The directory name or wildcard spec that this dired directory lists. Local to each dired buffer. May be a list, in which case the car is the @@ -6090,18 +6123,6 @@ \(fn DIR-OR-LIST &optional SWITCHES)" nil nil) -(defvar dired-auto-revert-buffer nil "\ -Automatically revert dired buffer on revisiting. -If t, revisiting an existing dired buffer automatically reverts it. -If its value is a function, call this function with the directory -name as single argument and revert the buffer if it returns non-nil. -Otherwise, a message offering to revert the changed dired buffer -is displayed. -Note that this is not the same as `auto-revert-mode' that -periodically reverts at specified time intervals.") - -(custom-autoload 'dired-auto-revert-buffer "dired" t) - (autoload 'dired-mode "dired" "\ Mode for \"editing\" directory listings. In Dired, you are \"editing\" a list of the files in a directory and @@ -6170,7 +6191,7 @@ ;;;*** ;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el" -;;;;;; (19674 7816)) +;;;;;; (19775 2028)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6196,8 +6217,8 @@ ;;;*** -;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (19277 -;;;;;; 34919)) +;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6216,7 +6237,7 @@ ;;;;;; standard-display-g1 standard-display-ascii standard-display-default ;;;;;; standard-display-8bit describe-current-display-table describe-display-table ;;;;;; set-display-table-slot display-table-slot make-display-table) -;;;;;; "disp-table" "disp-table.el" (19583 60940)) +;;;;;; "disp-table" "disp-table.el" (19780 4513)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6338,7 +6359,7 @@ ;;;*** ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el" -;;;;;; (19277 34922)) +;;;;;; (19775 2029)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6354,7 +6375,7 @@ ;;;*** -;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19631 26857)) +;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19780 4513)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\ @@ -6375,7 +6396,7 @@ ;;;*** ;;;### (autoloads (dns-mode-soa-increment-serial dns-mode) "dns-mode" -;;;;;; "textmodes/dns-mode.el" (19611 36311)) +;;;;;; "textmodes/dns-mode.el" (19780 4514)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6398,13 +6419,15 @@ ;;;*** -;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode -;;;;;; doc-view-mode-p) "doc-view" "doc-view.el" (19519 16431)) +;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe +;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ -Return non-nil if image type TYPE is available for `doc-view'. -Image types are symbols like `dvi', `postscript' or `pdf'. +Return non-nil if document type TYPE is available for `doc-view'. +Document types are symbols like `dvi', `ps', `pdf', or `odf' (any +OpenDocument format). \(fn TYPE)" nil nil) @@ -6420,6 +6443,13 @@ \(fn)" t nil) +(autoload 'doc-view-mode-maybe "doc-view" "\ +Switch to `doc-view-mode' if possible. +If the required external tools are not available, then fallback +to the next best mode. + +\(fn)" nil nil) + (autoload 'doc-view-minor-mode "doc-view" "\ Toggle Doc view minor mode. With arg, turn Doc view minor mode on if arg is positive, off otherwise. @@ -6434,7 +6464,7 @@ ;;;*** -;;;### (autoloads (doctor) "doctor" "play/doctor.el" (19696 28661)) +;;;### (autoloads (doctor) "doctor" "play/doctor.el" (19780 4514)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6444,7 +6474,7 @@ ;;;*** -;;;### (autoloads (double-mode) "double" "double.el" (19277 34916)) +;;;### (autoloads (double-mode) "double" "double.el" (19775 2028)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6459,7 +6489,7 @@ ;;;*** -;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (19277 34922)) +;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (19775 2029)) ;;; Generated autoloads from play/dunnet.el (autoload 'dunnet "dunnet" "\ @@ -6471,7 +6501,7 @@ ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-globalized-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (19658 807)) +;;;;;; "emacs-lisp/easy-mmode.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6485,8 +6515,9 @@ Optional LIGHTER is displayed in the modeline when the mode is on. Optional KEYMAP is the default keymap bound to the mode keymap. If non-nil, it should be a variable name (whose value is a keymap), - a keymap, or a list of arguments for `easy-mmode-define-keymap'. - If KEYMAP is a keymap or list, this also defines the variable MODE-map. + or an expression that returns either a keymap or a list of + arguments for `easy-mmode-define-keymap'. If KEYMAP is not a symbol, + this also defines the variable MODE-map. BODY contains code to execute each time the mode is enabled or disabled. It is executed after toggling the mode, and before running MODE-hook. @@ -6580,8 +6611,8 @@ ;;;*** ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define -;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (19580 -;;;;;; 19536)) +;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -6606,8 +6637,8 @@ :active ENABLE -ENABLE is an expression; the menu is enabled for selection -whenever this expression's value is non-nil. +ENABLE is an expression; the menu is enabled for selection whenever +this expression's value is non-nil. `:enable' is an alias for `:active'. The rest of the elements in MENU, are menu items. @@ -6644,8 +6675,8 @@ :active ENABLE -ENABLE is an expression; the item is enabled for selection -whenever this expression's value is non-nil. +ENABLE is an expression; the item is enabled for selection whenever +this expression's value is non-nil. `:enable' is an alias for `:active'. :visible INCLUDE @@ -6735,7 +6766,7 @@ ;;;;;; ebnf-eps-file ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ;;;;;; ebnf-spool-file ebnf-spool-directory ebnf-print-region ebnf-print-buffer ;;;;;; ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps" -;;;;;; "progmodes/ebnf2ps.el" (19668 19251)) +;;;;;; "progmodes/ebnf2ps.el" (19775 2029)) ;;; Generated autoloads from progmodes/ebnf2ps.el (autoload 'ebnf-customize "ebnf2ps" "\ @@ -7009,8 +7040,8 @@ ;;;;;; ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition ;;;;;; ebrowse-tags-view-definition ebrowse-tags-find-declaration ;;;;;; ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree -;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (19668 -;;;;;; 19022)) +;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7033,9 +7064,7 @@ (autoload 'ebrowse-member-mode "ebrowse" "\ Major mode for Ebrowse member buffers. -\\{ebrowse-member-mode-map} - -\(fn)" nil nil) +\(fn)" t nil) (autoload 'ebrowse-tags-view-declaration "ebrowse" "\ View declaration of member at point. @@ -7161,7 +7190,7 @@ ;;;*** ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el" -;;;;;; (19668 18204)) +;;;;;; (19775 2028)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7186,7 +7215,7 @@ ;;;*** ;;;### (autoloads (Electric-command-history-redo-expression) "echistory" -;;;;;; "echistory.el" (19277 34916)) +;;;;;; "echistory.el" (19775 2028)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7198,7 +7227,7 @@ ;;;*** ;;;### (autoloads (ecomplete-setup) "ecomplete" "gnus/ecomplete.el" -;;;;;; (19672 47597)) +;;;;;; (19780 4513)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7208,7 +7237,7 @@ ;;;*** -;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (19662 23507)) +;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (19775 2027)) ;;; Generated autoloads from cedet/ede.el (defvar global-ede-mode nil "\ @@ -7234,7 +7263,7 @@ ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" -;;;;;; "emacs-lisp/edebug.el" (19668 19725)) +;;;;;; "emacs-lisp/edebug.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7307,7 +7336,7 @@ ;;;;;; ediff-merge-directories-with-ancestor ediff-merge-directories ;;;;;; ediff-directories3 ediff-directory-revisions ediff-directories ;;;;;; ediff-buffers3 ediff-buffers ediff-backup ediff-current-file -;;;;;; ediff-files3 ediff-files) "ediff" "vc/ediff.el" (19580 19536)) +;;;;;; ediff-files3 ediff-files) "ediff" "vc/ediff.el" (19775 2030)) ;;; Generated autoloads from vc/ediff.el (autoload 'ediff-files "ediff" "\ @@ -7539,7 +7568,7 @@ ;;;*** ;;;### (autoloads (ediff-customize) "ediff-help" "vc/ediff-help.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2030)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7549,8 +7578,15 @@ ;;;*** +;;;### (autoloads nil "ediff-hook" "vc/ediff-hook.el" (19775 2030)) +;;; Generated autoloads from vc/ediff-hook.el + +(if (featurep 'xemacs) (progn (defun ediff-xemacs-init-menus nil (when (featurep 'menubar) (add-submenu '("Tools") ediff-menu "OO-Browser...") (add-submenu '("Tools") ediff-merge-menu "OO-Browser...") (add-submenu '("Tools") epatch-menu "OO-Browser...") (add-submenu '("Tools") ediff-misc-menu "OO-Browser...") (add-menu-button '("Tools") "-------" "OO-Browser..."))) (defvar ediff-menu '("Compare" ["Two Files..." ediff-files t] ["Two Buffers..." ediff-buffers t] ["Three Files..." ediff-files3 t] ["Three Buffers..." ediff-buffers3 t] "---" ["Two Directories..." ediff-directories t] ["Three Directories..." ediff-directories3 t] "---" ["File with Revision..." ediff-revision t] ["Directory Revisions..." ediff-directory-revisions t] "---" ["Windows Word-by-word..." ediff-windows-wordwise t] ["Windows Line-by-line..." ediff-windows-linewise t] "---" ["Regions Word-by-word..." ediff-regions-wordwise t] ["Regions Line-by-line..." ediff-regions-linewise t])) (defvar ediff-merge-menu '("Merge" ["Files..." ediff-merge-files t] ["Files with Ancestor..." ediff-merge-files-with-ancestor t] ["Buffers..." ediff-merge-buffers t] ["Buffers with Ancestor..." ediff-merge-buffers-with-ancestor t] "---" ["Directories..." ediff-merge-directories t] ["Directories with Ancestor..." ediff-merge-directories-with-ancestor t] "---" ["Revisions..." ediff-merge-revisions t] ["Revisions with Ancestor..." ediff-merge-revisions-with-ancestor t] ["Directory Revisions..." ediff-merge-directory-revisions t] ["Directory Revisions with Ancestor..." ediff-merge-directory-revisions-with-ancestor t])) (defvar epatch-menu '("Apply Patch" ["To a file..." ediff-patch-file t] ["To a buffer..." ediff-patch-buffer t])) (defvar ediff-misc-menu '("Ediff Miscellanea" ["Ediff Manual" ediff-documentation t] ["Customize Ediff" ediff-customize t] ["List Ediff Sessions" ediff-show-registry t] ["Use separate frame for Ediff control buffer" ediff-toggle-multiframe :style toggle :selected (if (and (featurep 'ediff-util) (boundp 'ediff-window-setup-function)) (eq ediff-window-setup-function 'ediff-setup-windows-multiframe))] ["Use a toolbar with Ediff control buffer" ediff-toggle-use-toolbar :style toggle :selected (if (featurep 'ediff-tbar) (ediff-use-toolbar-p))])) (if (and (featurep 'menubar) (not (featurep 'infodock)) (not (featurep 'ediff-hook))) (ediff-xemacs-init-menus))) (defvar menu-bar-ediff-misc-menu (make-sparse-keymap "Ediff Miscellanea")) (fset 'menu-bar-ediff-misc-menu (symbol-value 'menu-bar-ediff-misc-menu)) (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) (fset 'menu-bar-ediff-merge-menu (symbol-value 'menu-bar-ediff-merge-menu)) (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) (define-key menu-bar-ediff-menu [ediff-misc] `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu)) (define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator) (define-key menu-bar-ediff-menu [window] `(menu-item ,(purecopy "This Window and Next Window") compare-windows :help ,(purecopy "Compare the current window and the next window"))) (define-key menu-bar-ediff-menu [ediff-windows-linewise] `(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise :help ,(purecopy "Compare windows line-wise"))) (define-key menu-bar-ediff-menu [ediff-windows-wordwise] `(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise :help ,(purecopy "Compare windows word-wise"))) (define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator) (define-key menu-bar-ediff-menu [ediff-regions-linewise] `(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise :help ,(purecopy "Compare regions line-wise"))) (define-key menu-bar-ediff-menu [ediff-regions-wordwise] `(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise :help ,(purecopy "Compare regions word-wise"))) (define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator) (define-key menu-bar-ediff-menu [ediff-dir-revision] `(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions :help ,(purecopy "Compare directory files with their older versions"))) (define-key menu-bar-ediff-menu [ediff-revision] `(menu-item ,(purecopy "File with Revision...") ediff-revision :help ,(purecopy "Compare file with its older versions"))) (define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator) (define-key menu-bar-ediff-menu [ediff-directories3] `(menu-item ,(purecopy "Three Directories...") ediff-directories3 :help ,(purecopy "Compare files common to three directories simultaneously"))) (define-key menu-bar-ediff-menu [ediff-directories] `(menu-item ,(purecopy "Two Directories...") ediff-directories :help ,(purecopy "Compare files common to two directories simultaneously"))) (define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator) (define-key menu-bar-ediff-menu [ediff-buffers3] `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3 :help ,(purecopy "Compare three buffers simultaneously"))) (define-key menu-bar-ediff-menu [ediff-files3] `(menu-item ,(purecopy "Three Files...") ediff-files3 :help ,(purecopy "Compare three files simultaneously"))) (define-key menu-bar-ediff-menu [ediff-buffers] `(menu-item ,(purecopy "Two Buffers...") ediff-buffers :help ,(purecopy "Compare two buffers simultaneously"))) (define-key menu-bar-ediff-menu [ediff-files] `(menu-item ,(purecopy "Two Files...") ediff-files :help ,(purecopy "Compare two files simultaneously"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] `(menu-item ,(purecopy "Directory Revisions with Ancestor...") ediff-merge-directory-revisions-with-ancestor :help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] `(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions :help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] `(menu-item ,(purecopy "Revisions with Ancestor...") ediff-merge-revisions-with-ancestor :help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] `(menu-item ,(purecopy "Revisions...") ediff-merge-revisions :help ,(purecopy "Merge versions of the same file (without using ancestor information)"))) (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] menu-bar-separator) (define-key menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] `(menu-item ,(purecopy "Directories with Ancestor...") ediff-merge-directories-with-ancestor :help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] `(menu-item ,(purecopy "Directories...") ediff-merge-directories :help ,(purecopy "Merge files common to a pair of directories"))) (define-key menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] menu-bar-separator) (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor :help ,(purecopy "Merge buffers by comparing their contents with a common ancestor"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] `(menu-item ,(purecopy "Buffers...") ediff-merge-buffers :help ,(purecopy "Merge buffers (without using ancestor information)"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] `(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor :help ,(purecopy "Merge files by comparing them with a common ancestor"))) (define-key menu-bar-ediff-merge-menu [ediff-merge-files] `(menu-item ,(purecopy "Files...") ediff-merge-files :help ,(purecopy "Merge files (without using ancestor information)"))) (define-key menu-bar-epatch-menu [ediff-patch-buffer] `(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer :help ,(purecopy "Apply a patch to the contents of a buffer"))) (define-key menu-bar-epatch-menu [ediff-patch-file] `(menu-item ,(purecopy "To a File...") ediff-patch-file :help ,(purecopy "Apply a patch to a file"))) (define-key menu-bar-ediff-misc-menu [emultiframe] `(menu-item ,(purecopy "Use separate control buffer frame") ediff-toggle-multiframe :help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode"))) (define-key menu-bar-ediff-misc-menu [eregistry] `(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry :help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session"))) (define-key menu-bar-ediff-misc-menu [ediff-cust] `(menu-item ,(purecopy "Customize Ediff") ediff-customize :help ,(purecopy "Change some of the parameters that govern the behavior of Ediff"))) (define-key menu-bar-ediff-misc-menu [ediff-doc] `(menu-item ,(purecopy "Ediff Manual") ediff-documentation :help ,(purecopy "Bring up the Ediff manual")))) + +;;;*** + ;;;### (autoloads (ediff-show-registry) "ediff-mult" "vc/ediff-mult.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2030)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7563,7 +7599,7 @@ ;;;*** ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) -;;;;;; "ediff-util" "vc/ediff-util.el" (19664 56235)) +;;;;;; "ediff-util" "vc/ediff-util.el" (19780 4514)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7584,7 +7620,7 @@ ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro ;;;;;; edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el" -;;;;;; (19634 23255)) +;;;;;; (19775 2028)) ;;; Generated autoloads from edmacro.el (defvar edmacro-eight-bits nil "\ @@ -7637,7 +7673,7 @@ ;;;*** ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt" -;;;;;; "emulation/edt.el" (19674 11425)) +;;;;;; "emulation/edt.el" (19780 4513)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -7655,7 +7691,7 @@ ;;;*** ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el" -;;;;;; (19391 30349)) +;;;;;; (19775 2028)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -7692,7 +7728,7 @@ ;;;*** ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string) -;;;;;; "eldoc" "emacs-lisp/eldoc.el" (19462 38192)) +;;;;;; "eldoc" "emacs-lisp/eldoc.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -7736,7 +7772,7 @@ ;;;*** ;;;### (autoloads (electric-layout-mode electric-pair-mode electric-indent-mode) -;;;;;; "electric" "electric.el" (19687 6902)) +;;;;;; "electric" "electric.el" (19775 2028)) ;;; Generated autoloads from electric.el (defvar electric-indent-chars '(10) "\ @@ -7787,8 +7823,8 @@ ;;;*** -;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (19277 -;;;;;; 34916)) +;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -7805,7 +7841,7 @@ ;;;### (autoloads (elint-initialize elint-defun elint-current-buffer ;;;;;; elint-directory elint-file) "elint" "emacs-lisp/elint.el" -;;;;;; (19668 31925)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -7841,8 +7877,8 @@ ;;;*** ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list -;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (19277 -;;;;;; 34919)) +;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -7877,7 +7913,7 @@ ;;;*** ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el" -;;;;;; (19696 28661)) +;;;;;; (19775 2028)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -7892,7 +7928,7 @@ ;;;;;; emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote ;;;;;; emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor ;;;;;; emerge-buffers emerge-files-with-ancestor emerge-files) "emerge" -;;;;;; "vc/emerge.el" (19672 56753)) +;;;;;; "vc/emerge.el" (19677 34570)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -7953,7 +7989,7 @@ ;;;*** ;;;### (autoloads (enriched-decode enriched-encode enriched-mode) -;;;;;; "enriched" "textmodes/enriched.el" (19609 2751)) +;;;;;; "enriched" "textmodes/enriched.el" (19775 2030)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -7988,8 +8024,8 @@ ;;;;;; epa-sign-region epa-verify-cleartext-in-region epa-verify-region ;;;;;; epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file ;;;;;; epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys -;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (19672 -;;;;;; 56753)) +;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8162,7 +8198,7 @@ ;;;*** ;;;### (autoloads (epa-dired-do-encrypt epa-dired-do-sign epa-dired-do-verify -;;;;;; epa-dired-do-decrypt) "epa-dired" "epa-dired.el" (19580 19536)) +;;;;;; epa-dired-do-decrypt) "epa-dired" "epa-dired.el" (19775 2028)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8188,7 +8224,7 @@ ;;;*** ;;;### (autoloads (epa-file-disable epa-file-enable epa-file-handler) -;;;;;; "epa-file" "epa-file.el" (19634 14572)) +;;;;;; "epa-file" "epa-file.el" (19775 2028)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8210,7 +8246,7 @@ ;;;### (autoloads (epa-global-mail-mode epa-mail-import-keys epa-mail-encrypt ;;;;;; epa-mail-sign epa-mail-verify epa-mail-decrypt epa-mail-mode) -;;;;;; "epa-mail" "epa-mail.el" (19654 15628)) +;;;;;; "epa-mail" "epa-mail.el" (19775 2028)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8274,7 +8310,7 @@ ;;;*** -;;;### (autoloads (epg-make-context) "epg" "epg.el" (19580 19536)) +;;;### (autoloads (epg-make-context) "epg" "epg.el" (19780 4513)) ;;; Generated autoloads from epg.el (autoload 'epg-make-context "epg" "\ @@ -8285,7 +8321,7 @@ ;;;*** ;;;### (autoloads (epg-expand-group epg-check-configuration epg-configuration) -;;;;;; "epg-config" "epg-config.el" (19652 41479)) +;;;;;; "epg-config" "epg-config.el" (19775 2028)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8306,7 +8342,7 @@ ;;;*** ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc" -;;;;;; "erc/erc.el" (19580 19536)) +;;;;;; "erc/erc.el" (19775 2028)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8348,33 +8384,33 @@ ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (19277 -;;;;;; 34919)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (19277 34919)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (19775 2028)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (19277 34919)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (19775 2028)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (19277 34919)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (19780 4513)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (19277 34919)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (19780 4513)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8407,7 +8443,7 @@ ;;;;;; erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list ;;;;;; erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action ;;;;;; erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8469,8 +8505,8 @@ ;;;*** -;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (19277 -;;;;;; 34919)) +;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8482,15 +8518,15 @@ ;;;*** -;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (19277 -;;;;;; 34919)) +;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from erc/erc-hecomplete.el (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t) ;;;*** ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd" -;;;;;; "erc/erc-identd.el" (19277 34919)) +;;;;;; "erc/erc-identd.el" (19775 2028)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8512,7 +8548,7 @@ ;;;*** ;;;### (autoloads (erc-create-imenu-index) "erc-imenu" "erc/erc-imenu.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8522,20 +8558,20 @@ ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (19561 48711)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (19775 2028)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (19634 23255)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (19775 2028)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log" -;;;;;; "erc/erc-log.el" (19277 34919)) +;;;;;; "erc/erc-log.el" (19775 2028)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8567,7 +8603,7 @@ ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host ;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool ;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -8613,14 +8649,14 @@ ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (19277 34919)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (19775 2028)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** ;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -8632,7 +8668,7 @@ ;;;*** ;;;### (autoloads (erc-server-select erc-determine-network) "erc-networks" -;;;;;; "erc/erc-networks.el" (19277 34919)) +;;;;;; "erc/erc-networks.el" (19775 2028)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -8650,7 +8686,7 @@ ;;;*** ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify" -;;;;;; "erc/erc-notify.el" (19277 34919)) +;;;;;; "erc/erc-notify.el" (19775 2028)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -8668,33 +8704,33 @@ ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (19277 34919)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (19775 2028)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19277 -;;;;;; 34919)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (19277 34919)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (19775 2028)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (19277 34919)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (19775 2028)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** ;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode) -;;;;;; "erc-services" "erc/erc-services.el" (19311 8632)) +;;;;;; "erc-services" "erc/erc-services.el" (19775 2028)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -8711,14 +8747,14 @@ ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (19277 34919)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (19775 2028)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -8729,21 +8765,21 @@ ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (19277 -;;;;;; 34919)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (19277 34919)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (19780 4513)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** ;;;### (autoloads (erc-track-minor-mode) "erc-track" "erc/erc-track.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -8766,7 +8802,7 @@ ;;;*** ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size) -;;;;;; "erc-truncate" "erc/erc-truncate.el" (19277 34919)) +;;;;;; "erc-truncate" "erc/erc-truncate.el" (19775 2028)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -8786,7 +8822,7 @@ ;;;*** ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el" -;;;;;; (19639 17158)) +;;;;;; (19775 2028)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -8797,8 +8833,92 @@ ;;;*** -;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (19611 -;;;;;; 64957)) +;;;### (autoloads (ert-describe-test ert-run-tests-interactively +;;;;;; ert-run-tests-batch-and-exit ert-run-tests-batch ert-deftest) +;;;;;; "ert" "emacs-lisp/ert.el" (19775 2028)) +;;; Generated autoloads from emacs-lisp/ert.el + +(autoload 'ert-deftest "ert" "\ +Define NAME (a symbol) as a test. + +BODY is evaluated as a `progn' when the test is run. It should +signal a condition on failure or just return if the test passes. + +`should', `should-not' and `should-error' are useful for +assertions in BODY. + +Use `ert' to run tests interactively. + +Tests that are expected to fail can be marked as such +using :expected-result. See `ert-test-result-type-p' for a +description of valid values for RESULT-TYPE. + +\(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] [:tags '(TAG...)] BODY...)" nil (quote macro)) + +(put 'ert-deftest 'lisp-indent-function '2) + +(put 'ert-deftest 'doc-string-elt '3) + +(put 'ert-deftest 'lisp-indent-function 2) + +(put 'ert-info 'lisp-indent-function 1) + +(autoload 'ert-run-tests-batch "ert" "\ +Run the tests specified by SELECTOR, printing results to the terminal. + +SELECTOR works as described in `ert-select-tests', except if +SELECTOR is nil, in which case all tests rather than none will be +run; this makes the command line \"emacs -batch -l my-tests.el -f +ert-run-tests-batch-and-exit\" useful. + +Returns the stats object. + +\(fn &optional SELECTOR)" nil nil) + +(autoload 'ert-run-tests-batch-and-exit "ert" "\ +Like `ert-run-tests-batch', but exits Emacs when done. + +The exit status will be 0 if all test results were as expected, 1 +on unexpected results, or 2 if the tool detected an error outside +of the tests (e.g. invalid SELECTOR or bug in the code that runs +the tests). + +\(fn &optional SELECTOR)" nil nil) + +(autoload 'ert-run-tests-interactively "ert" "\ +Run the tests specified by SELECTOR and display the results in a buffer. + +SELECTOR works as described in `ert-select-tests'. +OUTPUT-BUFFER-NAME and MESSAGE-FN should normally be nil; they +are used for automated self-tests and specify which buffer to use +and how to display message. + +\(fn SELECTOR &optional OUTPUT-BUFFER-NAME MESSAGE-FN)" t nil) + +(defalias 'ert 'ert-run-tests-interactively) + +(autoload 'ert-describe-test "ert" "\ +Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). + +\(fn TEST-OR-TEST-NAME)" t nil) + +;;;*** + +;;;### (autoloads (ert-kill-all-test-buffers) "ert-x" "emacs-lisp/ert-x.el" +;;;;;; (19775 2028)) +;;; Generated autoloads from emacs-lisp/ert-x.el + +(put 'ert-with-test-buffer 'lisp-indent-function 1) + +(autoload 'ert-kill-all-test-buffers "ert-x" "\ +Kill all test buffers that are still live. + +\(fn)" t nil) + +;;;*** + +;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -8810,8 +8930,8 @@ ;;;*** -;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (19672 -;;;;;; 39436)) +;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from eshell/esh-test.el (autoload 'eshell-test "esh-test" "\ @@ -8822,7 +8942,7 @@ ;;;*** ;;;### (autoloads (eshell-command-result eshell-command eshell) "eshell" -;;;;;; "eshell/eshell.el" (19451 17238)) +;;;;;; "eshell/eshell.el" (19775 2028)) ;;; Generated autoloads from eshell/eshell.el (autoload 'eshell "eshell" "\ @@ -8863,7 +8983,7 @@ ;;;;;; visit-tags-table tags-table-mode find-tag-default-function ;;;;;; find-tag-hook tags-add-tables tags-compression-info-list ;;;;;; tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el" -;;;;;; (19672 56753)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9177,7 +9297,7 @@ ;;;;;; ethio-fidel-to-sera-marker ethio-fidel-to-sera-region ethio-fidel-to-sera-buffer ;;;;;; ethio-sera-to-fidel-marker ethio-sera-to-fidel-region ethio-sera-to-fidel-buffer ;;;;;; setup-ethiopic-environment-internal) "ethio-util" "language/ethio-util.el" -;;;;;; (19451 17238)) +;;;;;; (19780 4513)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9347,7 +9467,7 @@ ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline ;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el" -;;;;;; (19672 56753)) +;;;;;; (19775 2029)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9403,7 +9523,7 @@ ;;;### (autoloads (eudc-display-jpeg-as-button eudc-display-jpeg-inline ;;;;;; eudc-display-sound eudc-display-mail eudc-display-url eudc-display-generic-binary) -;;;;;; "eudc-bob" "net/eudc-bob.el" (19580 19536)) +;;;;;; "eudc-bob" "net/eudc-bob.el" (19775 2029)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -9439,7 +9559,7 @@ ;;;*** ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb) -;;;;;; "eudc-export" "net/eudc-export.el" (19580 19536)) +;;;;;; "eudc-export" "net/eudc-export.el" (19775 2029)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9456,7 +9576,7 @@ ;;;*** ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el" -;;;;;; (19634 23255)) +;;;;;; (19775 2029)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9466,8 +9586,8 @@ ;;;*** -;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (19277 -;;;;;; 34919)) +;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -9496,7 +9616,7 @@ ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p ;;;;;; executable-self-display executable-set-magic executable-interpret ;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (19277 34922)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -9539,7 +9659,7 @@ ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot ;;;;;; expand-abbrev-hook expand-add-abbrevs) "expand" "expand.el" -;;;;;; (19451 17238)) +;;;;;; (19775 2028)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -9588,7 +9708,7 @@ ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19651 33965)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19775 2029)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -9654,8 +9774,8 @@ ;;;### (autoloads (variable-pitch-mode buffer-face-toggle buffer-face-set ;;;;;; buffer-face-mode text-scale-adjust text-scale-decrease text-scale-increase ;;;;;; text-scale-set face-remap-set-base face-remap-reset-base -;;;;;; face-remap-add-relative) "face-remap" "face-remap.el" (19652 -;;;;;; 44405)) +;;;;;; face-remap-add-relative) "face-remap" "face-remap.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -9795,7 +9915,7 @@ ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (19609 2433)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (19763 27286)) ;;; Generated autoloads from mail/feedmail.el (autoload 'feedmail-send-it "feedmail" "\ @@ -9849,7 +9969,7 @@ ;;;*** ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu -;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (19318 65023)) +;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (19775 2028)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -9913,7 +10033,7 @@ ;;;### (autoloads (file-cache-minibuffer-complete file-cache-add-directory-recursively ;;;;;; file-cache-add-directory-using-locate file-cache-add-directory-using-find ;;;;;; file-cache-add-file file-cache-add-directory-list file-cache-add-directory) -;;;;;; "filecache" "filecache.el" (19672 41839)) +;;;;;; "filecache" "filecache.el" (19775 2028)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -9973,7 +10093,7 @@ ;;;;;; copy-file-locals-to-dir-locals delete-dir-local-variable ;;;;;; add-dir-local-variable delete-file-local-variable-prop-line ;;;;;; add-file-local-variable-prop-line delete-file-local-variable -;;;;;; add-file-local-variable) "files-x" "files-x.el" (19580 19536)) +;;;;;; add-file-local-variable) "files-x" "files-x.el" (19775 2028)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10038,8 +10158,8 @@ ;;;*** -;;;### (autoloads (filesets-init) "filesets" "filesets.el" (19611 -;;;;;; 60752)) +;;;### (autoloads (filesets-init) "filesets" "filesets.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10050,7 +10170,7 @@ ;;;*** -;;;### (autoloads (find-cmd) "find-cmd" "find-cmd.el" (19279 53114)) +;;;### (autoloads (find-cmd) "find-cmd" "find-cmd.el" (19775 2028)) ;;; Generated autoloads from find-cmd.el (autoload 'find-cmd "find-cmd" "\ @@ -10071,7 +10191,7 @@ ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options ;;;;;; find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el" -;;;;;; (19379 30332)) +;;;;;; (19775 2028)) ;;; Generated autoloads from find-dired.el (defvar find-ls-option (if (eq system-type 'berkeley-unix) (purecopy '("-ls" . "-gilsb")) (purecopy '("-exec ls -ld {} \\;" . "-ld"))) "\ @@ -10132,7 +10252,7 @@ ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file ;;;;;; ff-find-other-file ff-get-other-file) "find-file" "find-file.el" -;;;;;; (19442 62609)) +;;;;;; (19775 2028)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\ @@ -10226,7 +10346,7 @@ ;;;;;; find-variable find-variable-noselect find-function-other-frame ;;;;;; find-function-other-window find-function find-function-noselect ;;;;;; find-function-search-for-symbol find-library) "find-func" -;;;;;; "emacs-lisp/find-func.el" (19649 956)) +;;;;;; "emacs-lisp/find-func.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10381,7 +10501,7 @@ ;;;*** ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories -;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (19277 34916)) +;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (19775 2028)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10402,7 +10522,7 @@ ;;;*** ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords) -;;;;;; "finder" "finder.el" (19662 23188)) +;;;;;; "finder" "finder.el" (19775 2028)) ;;; Generated autoloads from finder.el (autoload 'finder-list-keywords "finder" "\ @@ -10424,7 +10544,7 @@ ;;;*** ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl" -;;;;;; "flow-ctrl.el" (19277 34916)) +;;;;;; "flow-ctrl.el" (19775 2028)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -10446,7 +10566,7 @@ ;;;*** ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el" -;;;;;; (19604 65275)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -10462,7 +10582,7 @@ ;;;*** ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode) -;;;;;; "flymake" "progmodes/flymake.el" (19670 2258)) +;;;;;; "flymake" "progmodes/flymake.el" (19780 4514)) ;;; Generated autoloads from progmodes/flymake.el (autoload 'flymake-mode "flymake" "\ @@ -10486,7 +10606,7 @@ ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (19681 34867)) +;;;;;; "flyspell" "textmodes/flyspell.el" (19775 2030)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -10556,7 +10676,7 @@ ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode ;;;;;; turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el" -;;;;;; (19277 34916)) +;;;;;; (19775 2028)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -10629,8 +10749,15 @@ ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (19277 -;;;;;; 34921)) +;;;### (autoloads nil "font-core" "font-core.el" (19780 4513)) +;;; Generated autoloads from font-core.el + +(put 'font-lock-defaults 'risky-local-variable t) + +;;;*** + +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from mail/footnote.el (autoload 'footnote-mode "footnote" "\ @@ -10643,8 +10770,15 @@ ;;;*** +;;;### (autoloads nil "format" "format.el" (19780 4513)) +;;; Generated autoloads from format.el + +(put 'format-alist 'risky-local-variable t) + +;;;*** + ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode) -;;;;;; "forms" "forms.el" (19406 15657)) +;;;;;; "forms" "forms.el" (19775 2028)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -10681,7 +10815,7 @@ ;;;*** ;;;### (autoloads (fortran-mode) "fortran" "progmodes/fortran.el" -;;;;;; (19672 56753)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -10759,7 +10893,7 @@ ;;;*** ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region -;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (19661 46305)) +;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (19775 2029)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -10808,7 +10942,7 @@ ;;;*** ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el" -;;;;;; (19614 24990)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -10869,8 +11003,8 @@ ;;;*** ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal -;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (19580 -;;;;;; 19536)) +;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -10947,7 +11081,7 @@ ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (19277 34922)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -10961,7 +11095,7 @@ ;;;### (autoloads (gmm-tool-bar-from-list gmm-widget-p gmm-error ;;;;;; gmm-message gmm-regexp-concat) "gmm-utils" "gnus/gmm-utils.el" -;;;;;; (19623 58490)) +;;;;;; (19780 4513)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11016,7 +11150,7 @@ ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (19687 6902)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (19780 4513)) ;;; Generated autoloads from gnus/gnus.el (when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) @@ -11069,7 +11203,7 @@ ;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group ;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize ;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent" -;;;;;; "gnus/gnus-agent.el" (19687 6902)) +;;;;;; "gnus/gnus-agent.el" (19775 2028)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11160,7 +11294,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (19695 9549)) +;;;;;; (19780 4513)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11171,7 +11305,7 @@ ;;;*** ;;;### (autoloads (gnus-bookmark-bmenu-list gnus-bookmark-jump gnus-bookmark-set) -;;;;;; "gnus-bookmark" "gnus/gnus-bookmark.el" (19670 666)) +;;;;;; "gnus-bookmark" "gnus/gnus-bookmark.el" (19780 4513)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -11196,8 +11330,8 @@ ;;;### (autoloads (gnus-cache-delete-group gnus-cache-rename-group ;;;;;; gnus-cache-generate-nov-databases gnus-cache-generate-active -;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (19693 -;;;;;; 40409)) +;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -11239,7 +11373,7 @@ ;;;*** ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article) -;;;;;; "gnus-delay" "gnus/gnus-delay.el" (19645 60484)) +;;;;;; "gnus-delay" "gnus/gnus-delay.el" (19780 4513)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11275,7 +11409,7 @@ ;;;*** ;;;### (autoloads (gnus-user-format-function-D gnus-user-format-function-d) -;;;;;; "gnus-diary" "gnus/gnus-diary.el" (19645 60484)) +;;;;;; "gnus-diary" "gnus/gnus-diary.el" (19775 2028)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -11291,7 +11425,7 @@ ;;;*** ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el" -;;;;;; (19662 7391)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -11302,7 +11436,7 @@ ;;;*** ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el" -;;;;;; (19648 31344)) +;;;;;; (19780 4513)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -11314,8 +11448,8 @@ ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png ;;;;;; gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header -;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (19635 -;;;;;; 50568)) +;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus-random-x-face "gnus-fun" "\ @@ -11360,7 +11494,7 @@ ;;;*** ;;;### (autoloads (gnus-treat-mail-gravatar gnus-treat-from-gravatar) -;;;;;; "gnus-gravatar" "gnus/gnus-gravatar.el" (19688 19082)) +;;;;;; "gnus-gravatar" "gnus/gnus-gravatar.el" (19775 2028)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -11378,7 +11512,7 @@ ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (19672 21006)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (19780 4513)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -11396,7 +11530,7 @@ ;;;*** ;;;### (autoloads (gnus-html-prefetch-images gnus-article-html) "gnus-html" -;;;;;; "gnus/gnus-html.el" (19687 6902)) +;;;;;; "gnus/gnus-html.el" (19775 2028)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -11412,7 +11546,7 @@ ;;;*** ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el" -;;;;;; (19636 38740)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -11427,7 +11561,7 @@ ;;;### (autoloads (gnus-mailing-list-mode gnus-mailing-list-insinuate ;;;;;; turn-on-gnus-mailing-list-mode) "gnus-ml" "gnus/gnus-ml.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -11452,7 +11586,7 @@ ;;;### (autoloads (gnus-group-split-fancy gnus-group-split gnus-group-split-update ;;;;;; gnus-group-split-setup) "gnus-mlspl" "gnus/gnus-mlspl.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -11553,7 +11687,7 @@ ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (19662 23188)) +;;;;;; "gnus-msg" "gnus/gnus-msg.el" (19780 4513)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -11561,7 +11695,7 @@ Like `message-mail', but with Gnus paraphernalia, particularly the Gcc: header for archiving purposes. -\(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-ACTION YANK-ACTION SEND-ACTIONS)" t nil) +\(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-ACTION YANK-ACTION SEND-ACTIONS RETURN-ACTION)" t nil) (autoload 'gnus-button-mailto "gnus-msg" "\ Mail to ADDRESS. @@ -11579,7 +11713,7 @@ ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon ;;;;;; gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el" -;;;;;; (19635 50568)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -11606,7 +11740,7 @@ ;;;;;; gnus-sorted-nintersection gnus-sorted-range-intersection ;;;;;; gnus-sorted-intersection gnus-intersection gnus-sorted-complement ;;;;;; gnus-sorted-ndifference gnus-sorted-difference) "gnus-range" -;;;;;; "gnus/gnus-range.el" (19604 65275)) +;;;;;; "gnus/gnus-range.el" (19775 2028)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -11674,7 +11808,7 @@ ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (19645 60484)) +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (19775 2028)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -11690,8 +11824,8 @@ ;;;*** ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate -;;;;;; gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (19582 -;;;;;; 65302)) +;;;;;; gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -11719,7 +11853,7 @@ ;;;*** ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el" -;;;;;; (19638 16738)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -11730,7 +11864,7 @@ ;;;*** ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" -;;;;;; (19672 21006)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -11741,7 +11875,7 @@ ;;;*** ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" -;;;;;; (19695 9549)) +;;;;;; (19780 4513)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -11753,7 +11887,7 @@ ;;;*** ;;;### (autoloads (gnus-sync-install-hooks gnus-sync-initialize) -;;;;;; "gnus-sync" "gnus/gnus-sync.el" (19630 1041)) +;;;;;; "gnus-sync" "gnus/gnus-sync.el" (19775 2028)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -11769,7 +11903,7 @@ ;;;*** ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el" -;;;;;; (19626 25721)) +;;;;;; (19780 4513)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -11779,7 +11913,7 @@ ;;;*** -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19675 8283)) +;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19775 2029)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -11806,8 +11940,8 @@ ;;;*** ;;;### (autoloads (goto-address-prog-mode goto-address-mode goto-address -;;;;;; goto-address-at-point) "goto-addr" "net/goto-addr.el" (19360 -;;;;;; 14173)) +;;;;;; goto-address-at-point) "goto-addr" "net/goto-addr.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -11845,8 +11979,8 @@ ;;;*** -;;;### (autoloads (gravatar-retrieve) "gravatar" "gnus/gravatar.el" -;;;;;; (19626 25721)) +;;;### (autoloads (gravatar-retrieve-synchronously gravatar-retrieve) +;;;;;; "gravatar" "gnus/gravatar.el" (19775 2028)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -11855,11 +11989,16 @@ \(fn MAIL-ADDRESS CB &optional CBARGS)" nil nil) +(autoload 'gravatar-retrieve-synchronously "gravatar" "\ +Retrieve MAIL-ADDRESS gravatar and returns it. + +\(fn MAIL-ADDRESS)" nil nil) + ;;;*** ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (19687 6902)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (19780 4514)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -11892,7 +12031,7 @@ (custom-autoload 'grep-setup-hook "grep" t) -(defconst grep-regexp-alist '(("^\\(.+?\\)\\(:[ ]*\\)\\([0-9]+\\)\\2" 1 3) ("^\\(\\(.+?\\):\\([1-9][0-9]*\\):\\).*?\\(\\[01;31m\\(?:\\[K\\)?\\)\\(.*?\\)\\(\\[[0-9]*m\\)" 2 3 ((lambda nil (setq compilation-error-screen-columns nil) (- (match-beginning 4) (match-end 1))) lambda nil (- (match-end 5) (match-end 1) (- (match-end 4) (match-beginning 4)))) nil 1) ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "\ +(defconst grep-regexp-alist '(("^\\(.+?\\)\\(:[ ]*\\)\\([1-9][0-9]*\\)\\2" 1 3) ("^\\(\\(.+?\\):\\([1-9][0-9]*\\):\\).*?\\(\\[01;31m\\(?:\\[K\\)?\\)\\(.*?\\)\\(\\[[0-9]*m\\)" 2 3 ((lambda nil (setq compilation-error-screen-columns nil) (- (match-beginning 4) (match-end 1))) lambda nil (- (match-end 5) (match-end 1) (- (match-end 4) (match-beginning 4)))) nil 1) ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "\ Regexp used to match grep hits. See `compilation-error-regexp-alist'.") (defvar grep-program (purecopy "grep") "\ @@ -12015,7 +12154,7 @@ ;;;*** -;;;### (autoloads (gs-load-image) "gs" "gs.el" (19277 34916)) +;;;### (autoloads (gs-load-image) "gs" "gs.el" (19775 2028)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12029,7 +12168,7 @@ ;;;*** ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb -;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19611 36621)) +;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19775 2029)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12115,8 +12254,8 @@ ;;;*** -;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19277 -;;;;;; 34922)) +;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -12134,7 +12273,7 @@ ;;;*** ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el" -;;;;;; (19267 61658)) +;;;;;; (19763 27287)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -12163,7 +12302,7 @@ ;;;### (autoloads (mail-check-payment mail-add-payment-async mail-add-payment ;;;;;; hashcash-verify-payment hashcash-insert-payment-async hashcash-insert-payment) -;;;;;; "hashcash" "mail/hashcash.el" (19635 50568)) +;;;;;; "hashcash" "mail/hashcash.el" (19780 4513)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -12208,7 +12347,7 @@ ;;;### (autoloads (scan-buf-previous-region scan-buf-next-region ;;;;;; scan-buf-move-to-region help-at-pt-display-when-idle help-at-pt-set-timer ;;;;;; help-at-pt-cancel-timer display-local-help help-at-pt-kbd-string -;;;;;; help-at-pt-string) "help-at-pt" "help-at-pt.el" (19277 34916)) +;;;;;; help-at-pt-string) "help-at-pt" "help-at-pt.el" (19775 2028)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -12338,7 +12477,7 @@ ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories ;;;;;; describe-syntax describe-variable variable-at-point describe-function-1 ;;;;;; find-lisp-object-file-name help-C-file-name describe-function) -;;;;;; "help-fns" "help-fns.el" (19649 15956)) +;;;;;; "help-fns" "help-fns.el" (19775 2028)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -12418,7 +12557,7 @@ ;;;*** ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2028)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -12434,8 +12573,8 @@ ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button ;;;;;; help-make-xrefs help-buffer help-setup-xref help-mode-finish -;;;;;; help-mode-setup help-mode) "help-mode" "help-mode.el" (19635 -;;;;;; 56796)) +;;;;;; help-mode-setup help-mode) "help-mode" "help-mode.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -12527,7 +12666,7 @@ ;;;*** ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper" -;;;;;; "emacs-lisp/helper.el" (19580 19536)) +;;;;;; "emacs-lisp/helper.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -12543,7 +12682,7 @@ ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (19648 31344)) +;;;;;; "hexl.el" (19775 2028)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -12640,7 +12779,7 @@ ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer ;;;;;; hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer ;;;;;; global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" -;;;;;; (19635 50568)) +;;;;;; (19775 2028)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -12774,7 +12913,7 @@ ;;;*** ;;;### (autoloads (hide-ifdef-mode) "hideif" "progmodes/hideif.el" -;;;;;; (19668 19057)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -12814,7 +12953,7 @@ ;;;*** ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (19277 34922)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -12876,8 +13015,8 @@ ;;;;;; highlight-compare-buffers highlight-changes-rotate-faces ;;;;;; highlight-changes-previous-change highlight-changes-next-change ;;;;;; highlight-changes-remove-highlight highlight-changes-visible-mode -;;;;;; highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19630 -;;;;;; 1041)) +;;;;;; highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13006,7 +13145,7 @@ ;;;;;; hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction ;;;;;; hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space ;;;;;; hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp" -;;;;;; "hippie-exp.el" (19672 56753)) +;;;;;; "hippie-exp.el" (19775 2028)) ;;; Generated autoloads from hippie-exp.el (defvar hippie-expand-try-functions-list '(try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol) "\ @@ -13079,7 +13218,7 @@ ;;;*** ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el" -;;;;;; (19515 27412)) +;;;;;; (19775 2028)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -13123,7 +13262,7 @@ ;;;;;; holiday-bahai-holidays holiday-islamic-holidays holiday-christian-holidays ;;;;;; holiday-hebrew-holidays holiday-other-holidays holiday-local-holidays ;;;;;; holiday-oriental-holidays holiday-general-holidays) "holidays" -;;;;;; "calendar/holidays.el" (19662 28391)) +;;;;;; "calendar/holidays.el" (19775 2027)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -13271,8 +13410,8 @@ ;;;*** -;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (19582 -;;;;;; 65302)) +;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -13283,7 +13422,7 @@ ;;;*** ;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer) -;;;;;; "htmlfontify" "htmlfontify.el" (19631 26857)) +;;;;;; "htmlfontify" "htmlfontify.el" (19780 4513)) ;;; Generated autoloads from htmlfontify.el (autoload 'htmlfontify-buffer "htmlfontify" "\ @@ -13316,8 +13455,8 @@ ;;;*** ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter -;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (19580 -;;;;;; 19536)) +;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -13414,7 +13553,7 @@ ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (19632 44567)) +;;;;;; "ibuffer" "ibuffer.el" (19780 4513)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -13455,7 +13594,7 @@ ;;;### (autoloads (icalendar-import-buffer icalendar-import-file ;;;;;; icalendar-export-region icalendar-export-file) "icalendar" -;;;;;; "calendar/icalendar.el" (19580 19536)) +;;;;;; "calendar/icalendar.el" (19780 4513)) ;;; Generated autoloads from calendar/icalendar.el (autoload 'icalendar-export-file "icalendar" "\ @@ -13507,8 +13646,8 @@ ;;;*** -;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19408 -;;;;;; 44404)) +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -13529,7 +13668,7 @@ ;;;*** -;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19668 19042)) +;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19775 2029)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -13570,7 +13709,7 @@ ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (19675 14361)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -13596,7 +13735,7 @@ ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (19675 14373)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/idlwave.el (autoload 'idlwave-mode "idlwave" "\ @@ -13730,8 +13869,8 @@ ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19604 -;;;;;; 1959)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -13992,7 +14131,7 @@ ;;;*** -;;;### (autoloads (ielm) "ielm" "ielm.el" (19277 34916)) +;;;### (autoloads (ielm) "ielm" "ielm.el" (19775 2028)) ;;; Generated autoloads from ielm.el (add-hook 'same-window-buffer-names (purecopy "*ielm*")) @@ -14004,7 +14143,7 @@ ;;;*** -;;;### (autoloads (iimage-mode) "iimage" "iimage.el" (19629 13333)) +;;;### (autoloads (iimage-mode) "iimage" "iimage.el" (19780 4513)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -14021,7 +14160,7 @@ ;;;;;; put-image create-image image-type-auto-detected-p image-type-available-p ;;;;;; image-type image-type-from-file-name image-type-from-file-header ;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" -;;;;;; (19652 54251)) +;;;;;; (19775 2028)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -14227,7 +14366,7 @@ ;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag ;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs ;;;;;; image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs) -;;;;;; "image-dired" "image-dired.el" (19457 25386)) +;;;;;; "image-dired" "image-dired.el" (19780 45051)) ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ @@ -14365,7 +14504,7 @@ ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp ;;;;;; image-file-name-regexps image-file-name-extensions) "image-file" -;;;;;; "image-file.el" (19277 34916)) +;;;;;; "image-file.el" (19775 2028)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\ @@ -14427,7 +14566,7 @@ ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (19611 35948)) +;;;;;; image-mode) "image-mode" "image-mode.el" (19780 4513)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -14468,7 +14607,7 @@ ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (19611 60767)) +;;;;;; imenu-sort-function) "imenu" "imenu.el" (19775 2028)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -14585,7 +14724,7 @@ ;;;### (autoloads (indian-2-column-to-ucs-region in-is13194-pre-write-conversion ;;;;;; in-is13194-post-read-conversion indian-compose-string indian-compose-region) -;;;;;; "ind-util" "language/ind-util.el" (19277 34920)) +;;;;;; "ind-util" "language/ind-util.el" (19780 4513)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -14617,7 +14756,7 @@ ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command ;;;;;; inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp" -;;;;;; "progmodes/inf-lisp.el" (19634 23255)) +;;;;;; "progmodes/inf-lisp.el" (19780 4514)) ;;; Generated autoloads from progmodes/inf-lisp.el (defvar inferior-lisp-filter-regexp (purecopy "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'") "\ @@ -14685,7 +14824,7 @@ ;;;;;; Info-goto-emacs-command-node Info-mode info-finder info-apropos ;;;;;; Info-index Info-directory Info-on-current-buffer info-standalone ;;;;;; info-emacs-manual info info-other-window) "info" "info.el" -;;;;;; (19688 19082)) +;;;;;; (19775 2028)) ;;; Generated autoloads from info.el (autoload 'info-other-window "info" "\ @@ -14867,7 +15006,7 @@ ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file ;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" -;;;;;; (19277 34916)) +;;;;;; (19775 2028)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -14914,35 +15053,92 @@ ;;;*** -;;;### (autoloads (info-xref-check-all-custom info-xref-check-all -;;;;;; info-xref-check) "info-xref" "info-xref.el" (19277 34916)) +;;;### (autoloads (info-xref-docstrings info-xref-check-all-custom +;;;;;; info-xref-check-all info-xref-check) "info-xref" "info-xref.el" +;;;;;; (19780 4513)) ;;; Generated autoloads from info-xref.el (autoload 'info-xref-check "info-xref" "\ Check external references in FILENAME, an info document. +Interactively from an `Info-mode' or `texinfo-mode' buffer the +current info file is the default. + +Results are shown in a `compilation-mode' buffer. The format is +a bit rough, but there shouldn't be many problems normally. The +file:line:column: is the info document, but of course normally +any correction should be made in the original .texi file. +Finding the right place in the .texi is a manual process. + +When a target info file doesn't exist there's obviously no way to +validate node references within it. A message is given for +missing target files once per source document. It could be +simply that you don't have the target installed, or it could be a +mistake in the reference. + +Indirect info files are understood, just pass the top-level +foo.info to `info-xref-check' and it traverses all sub-files. +Compressed info files are accepted too as usual for `Info-mode'. + +\"makeinfo\" checks references internal to an info document, but +not external references, which makes it rather easy for mistakes +to creep in or node name changes to go unnoticed. +`Info-validate' doesn't check external references either. \(fn FILENAME)" t nil) (autoload 'info-xref-check-all "info-xref" "\ -Check external references in all info documents in the usual path. -The usual path is `Info-directory-list' and `Info-additional-directory-list'. +Check external references in all info documents in the info path. +`Info-directory-list' and `Info-additional-directory-list' are +the info paths. See `info-xref-check' for how each file is +checked. + +The search for \"all\" info files is rather permissive, since +info files don't necessarily have a \".info\" extension and in +particular the Emacs manuals normally don't. If you have a +source code directory in `Info-directory-list' then a lot of +extraneous files might be read. This will be time consuming but +should be harmless. \(fn)" t nil) (autoload 'info-xref-check-all-custom "info-xref" "\ Check info references in all customize groups and variables. -`custom-manual' and `info-link' entries in the `custom-links' list are checked. +Info references can be in `custom-manual' or `info-link' entries +of the `custom-links' for a variable. -`custom-load' autoloads for all symbols are loaded in order to get all the -link information. This will be a lot of lisp packages loaded, and can take -quite a while. +Any `custom-load' autoloads in variables are loaded in order to +get full link information. This will be a lot of Lisp packages +and can take a long time. \(fn)" t nil) +(autoload 'info-xref-docstrings "info-xref" "\ +Check docstring info node references in source files. +The given files are searched for docstring hyperlinks like + + Info node `(elisp)Documentation Tips' + +and those links checked by attempting to visit the target nodes +as per `info-xref-check' does. + +Interactively filenames are read as a wildcard pattern like +\"foo*.el\", with the current file as a default. Usually this +will be lisp sources, but anything with such hyperlinks can be +checked, including the Emacs .c sources (or the etc/DOC file of +all builtins). + +Because info node hyperlinks are found by a simple regexp search +in the files, the Lisp code checked doesn't have to be loaded, +and links can be in the file commentary or elsewhere too. Even +.elc files can usually be checked successfully if you don't have +the sources handy. + +\(fn FILENAME-LIST)" t nil) + ;;;*** ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-split-threshold -;;;;;; Info-tagify) "informat" "informat.el" (19277 34916)) +;;;;;; Info-tagify) "informat" "informat.el" (19775 2028)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -14989,7 +15185,7 @@ ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method ;;;;;; isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el" -;;;;;; (19277 34920)) +;;;;;; (19780 4513)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -15009,8 +15205,8 @@ ;;;*** -;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (19277 -;;;;;; 34916)) +;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from isearchb.el (autoload 'isearchb-activate "isearchb" "\ @@ -15026,7 +15222,7 @@ ;;;### (autoloads (iso-cvt-define-menu iso-cvt-write-only iso-cvt-read-only ;;;;;; iso-sgml2iso iso-iso2sgml iso-iso2duden iso-iso2gtex iso-gtex2iso ;;;;;; iso-tex2iso iso-iso2tex iso-german iso-spanish) "iso-cvt" -;;;;;; "international/iso-cvt.el" (19277 34920)) +;;;;;; "international/iso-cvt.el" (19775 2028)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -15117,7 +15313,7 @@ ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (19277 34920)) +;;;;;; (19775 2028)) ;;; Generated autoloads from international/iso-transl.el (or key-translation-map (setq key-translation-map (make-sparse-keymap))) (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) @@ -15129,7 +15325,7 @@ ;;;;;; ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell ;;;;;; ispell-help ispell-pdict-save ispell-word ispell-personal-dictionary) -;;;;;; "ispell" "textmodes/ispell.el" (19672 56753)) +;;;;;; "ispell" "textmodes/ispell.el" (19780 4514)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -15349,8 +15545,8 @@ ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19656 -;;;;;; 61992)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -15375,7 +15571,7 @@ ;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region ;;;;;; japanese-hiragana-region japanese-katakana-region japanese-zenkaku ;;;;;; japanese-hankaku japanese-hiragana japanese-katakana setup-japanese-environment-internal) -;;;;;; "japan-util" "language/japan-util.el" (19277 34920)) +;;;;;; "japan-util" "language/japan-util.el" (19780 4513)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -15453,7 +15649,7 @@ ;;;*** ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr" -;;;;;; "jka-compr.el" (19455 3103)) +;;;;;; "jka-compr.el" (19775 2028)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -15476,16 +15672,12 @@ ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19670 666)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19775 2029)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ Major mode for editing JavaScript. -Key bindings: - -\\{js-mode-map} - \(fn)" t nil) (defalias 'javascript-mode 'js-mode) @@ -15494,7 +15686,7 @@ ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup ;;;;;; keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -15550,7 +15742,7 @@ ;;;*** ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el" -;;;;;; (19277 34920)) +;;;;;; (19780 4513)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -15571,8 +15763,8 @@ ;;;*** -;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (19609 -;;;;;; 2343)) +;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -15597,7 +15789,7 @@ ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro ;;;;;; kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter ;;;;;; kmacro-call-macro kmacro-end-macro kmacro-start-macro kmacro-exec-ring-item) -;;;;;; "kmacro" "kmacro.el" (19498 12592)) +;;;;;; "kmacro" "kmacro.el" (19780 4513)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -15708,7 +15900,7 @@ ;;;*** ;;;### (autoloads (setup-korean-environment-internal) "korea-util" -;;;;;; "language/korea-util.el" (19277 34920)) +;;;;;; "language/korea-util.el" (19780 4513)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -15722,21 +15914,19 @@ ;;;*** -;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el" -;;;;;; (19675 8295)) +;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el" +;;;;;; (19775 2029)) ;;; Generated autoloads from play/landmark.el -(defalias 'landmark-repeat 'lm-test-run) +(defalias 'landmark-repeat 'landmark-test-run) -(autoload 'lm-test-run "landmark" "\ -Run 100 Lm games, each time saving the weights from the previous game. +(autoload 'landmark-test-run "landmark" "\ +Run 100 Landmark games, each time saving the weights from the previous game. \(fn)" t nil) -(defalias 'landmark 'lm) - -(autoload 'lm "landmark" "\ -Start or resume an Lm game. +(autoload 'landmark "landmark" "\ +Start or resume an Landmark game. If a game is in progress, this command allows you to resume it. Here is the relation between prefix args and game options: @@ -15747,7 +15937,7 @@ 3 | no | yes 4 | no | no -You start by moving to a square and typing \\[lm-start-robot], +You start by moving to a square and typing \\[landmark-start-robot], if you did not use a prefix arg to ask for automatic start. Use \\[describe-mode] for more info. @@ -15757,7 +15947,7 @@ ;;;### (autoloads (lao-compose-region lao-composition-function lao-transcribe-roman-to-lao-string ;;;;;; lao-transcribe-single-roman-syllable-to-lao lao-compose-string) -;;;;;; "lao-util" "language/lao-util.el" (19277 34920)) +;;;;;; "lao-util" "language/lao-util.el" (19780 4513)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -15796,7 +15986,7 @@ ;;;### (autoloads (latexenc-find-file-coding-system latexenc-coding-system-to-inputenc ;;;;;; latexenc-inputenc-to-coding-system latex-inputenc-coding-alist) -;;;;;; "latexenc" "international/latexenc.el" (19277 34920)) +;;;;;; "latexenc" "international/latexenc.el" (19775 2028)) ;;; Generated autoloads from international/latexenc.el (defvar latex-inputenc-coding-alist (purecopy '(("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ @@ -15828,7 +16018,7 @@ ;;;*** ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display) -;;;;;; "latin1-disp" "international/latin1-disp.el" (19277 34920)) +;;;;;; "latin1-disp" "international/latin1-disp.el" (19780 4513)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -15870,7 +16060,7 @@ ;;;*** ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el" -;;;;;; (19611 1232)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -15881,7 +16071,7 @@ ;;;*** ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el" -;;;;;; (19277 34916)) +;;;;;; (19775 2028)) ;;; Generated autoloads from ledit.el (defconst ledit-save-files t "\ @@ -15916,7 +16106,7 @@ ;;;*** -;;;### (autoloads (life) "life" "play/life.el" (19668 18627)) +;;;### (autoloads (life) "life" "play/life.el" (19775 2029)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -15930,7 +16120,7 @@ ;;;*** ;;;### (autoloads (global-linum-mode linum-mode linum-format) "linum" -;;;;;; "linum.el" (19580 19536)) +;;;;;; "linum.el" (19775 2028)) ;;; Generated autoloads from linum.el (defvar linum-format 'dynamic "\ @@ -15968,8 +16158,8 @@ ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (19277 -;;;;;; 34916)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16001,7 +16191,7 @@ ;;;*** ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) -;;;;;; "locate" "locate.el" (19673 45510)) +;;;;;; "locate" "locate.el" (19775 2028)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -16053,7 +16243,7 @@ ;;;*** -;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (19657 48297)) +;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (19775 2030)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16080,8 +16270,8 @@ ;;;*** -;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (19634 -;;;;;; 14572)) +;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -16091,8 +16281,8 @@ ;;;*** -;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19277 -;;;;;; 34916)) +;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from longlines.el (autoload 'longlines-mode "longlines" "\ @@ -16113,8 +16303,8 @@ ;;;*** ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer -;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (19451 -;;;;;; 17238)) +;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt))) @@ -16208,7 +16398,7 @@ ;;;*** ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el" -;;;;;; (19687 6902)) +;;;;;; (19775 2028)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -16219,8 +16409,8 @@ ;;;*** -;;;### (autoloads (lunar-phases) "lunar" "calendar/lunar.el" (19580 -;;;;;; 19536)) +;;;### (autoloads (lunar-phases) "lunar" "calendar/lunar.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -16234,20 +16424,19 @@ ;;;*** -;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (19277 -;;;;;; 34922)) +;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ A major mode to edit m4 macro files. -\\{m4-mode-map} \(fn)" t nil) ;;;*** ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/macroexp.el (autoload 'macroexpand-all "macroexp" "\ @@ -16261,7 +16450,7 @@ ;;;*** ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro -;;;;;; name-last-kbd-macro) "macros" "macros.el" (19580 19536)) +;;;;;; name-last-kbd-macro) "macros" "macros.el" (19780 4513)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -16350,7 +16539,7 @@ ;;;*** ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr" -;;;;;; "mail/mail-extr.el" (19668 31646)) +;;;;;; "mail/mail-extr.el" (19780 4513)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -16382,7 +16571,7 @@ ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history ;;;;;; mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2028)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -16414,7 +16603,7 @@ ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region ;;;;;; mail-unquote-printable mail-quote-printable-region mail-quote-printable ;;;;;; mail-file-babyl-p mail-use-rfc822) "mail-utils" "mail/mail-utils.el" -;;;;;; (19635 50568)) +;;;;;; (19775 2028)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -16476,8 +16665,8 @@ ;;;*** ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup -;;;;;; mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (19277 -;;;;;; 34921)) +;;;;;; mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -16519,8 +16708,8 @@ ;;;*** ;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases -;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (19277 -;;;;;; 34921)) +;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -16566,7 +16755,7 @@ ;;;*** ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el" -;;;;;; (19693 26133)) +;;;;;; (19775 2028)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -16580,7 +16769,7 @@ ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) -;;;;;; "make-mode" "progmodes/make-mode.el" (19594 48841)) +;;;;;; "make-mode" "progmodes/make-mode.el" (19775 2029)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -16697,8 +16886,8 @@ ;;;*** -;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19668 -;;;;;; 19366)) +;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -16710,7 +16899,7 @@ ;;;*** ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el" -;;;;;; (19614 24990)) +;;;;;; (19780 4513)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -16764,7 +16953,7 @@ ;;;*** -;;;### (autoloads (master-mode) "master" "master.el" (19277 34916)) +;;;### (autoloads (master-mode) "master" "master.el" (19780 4513)) ;;; Generated autoloads from master.el (autoload 'master-mode "master" "\ @@ -16787,7 +16976,7 @@ ;;;*** ;;;### (autoloads (minibuffer-depth-indicate-mode) "mb-depth" "mb-depth.el" -;;;;;; (19277 34916)) +;;;;;; (19775 2029)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -16812,13 +17001,20 @@ ;;;*** +;;;### (autoloads nil "menu-bar" "menu-bar.el" (19775 2029)) +;;; Generated autoloads from menu-bar.el + +(put 'menu-bar-mode 'standard-value '(t)) + +;;;*** + ;;;### (autoloads (message-unbold-region message-bold-region message-news-other-frame ;;;;;; message-news-other-window message-mail-other-frame message-mail-other-window ;;;;;; message-bounce message-resend message-insinuate-rmail message-forward-rmail-make-body ;;;;;; message-forward-make-body message-forward message-recover ;;;;;; message-supersede message-cancel-news message-followup message-wide-reply ;;;;;; message-reply message-news message-mail message-mode) "message" -;;;;;; "gnus/message.el" (19695 9549)) +;;;;;; "gnus/message.el" (19775 2028)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -16870,7 +17066,7 @@ to continue editing a message already being composed. SWITCH-FUNCTION is a function used to switch to and display the mail buffer. -\(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-FUNCTION YANK-ACTION SEND-ACTIONS)" t nil) +\(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-FUNCTION YANK-ACTION SEND-ACTIONS RETURN-ACTION &rest IGNORED)" t nil) (autoload 'message-news "message" "\ Start editing a news article to be sent. @@ -16984,26 +17180,16 @@ ;;;*** ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el" -;;;;;; (19673 1234)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/meta-mode.el (autoload 'metafont-mode "meta-mode" "\ Major mode for editing Metafont sources. -Special commands: -\\{meta-mode-map} - -Turning on Metafont mode calls the value of the variables -`meta-common-mode-hook' and `metafont-mode-hook'. \(fn)" t nil) (autoload 'metapost-mode "meta-mode" "\ Major mode for editing MetaPost sources. -Special commands: -\\{meta-mode-map} - -Turning on MetaPost mode calls the value of the variable -`meta-common-mode-hook' and `metafont-mode-hook'. \(fn)" t nil) @@ -17011,7 +17197,7 @@ ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body ;;;;;; metamail-interpret-header) "metamail" "mail/metamail.el" -;;;;;; (19354 34807)) +;;;;;; (19775 2028)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17056,7 +17242,7 @@ ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose ;;;;;; mh-smail-batch mh-smail-other-window mh-smail) "mh-comp" -;;;;;; "mh-e/mh-comp.el" (19444 23363)) +;;;;;; "mh-e/mh-comp.el" (19780 4513)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -17102,10 +17288,10 @@ Elements look like (HEADER . VALUE) where both HEADER and VALUE are strings. -CONTINUE, SWITCH-FUNCTION, YANK-ACTION and SEND-ACTIONS are -ignored. +CONTINUE, SWITCH-FUNCTION, YANK-ACTION, SEND-ACTIONS, and +RETURN-ACTION are ignored. -\(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-FUNCTION YANK-ACTION SEND-ACTIONS)" nil nil) +\(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-FUNCTION YANK-ACTION SEND-ACTIONS RETURN-ACTION &rest IGNORED)" nil nil) (autoload 'mh-send-letter "mh-comp" "\ Save draft and send message. @@ -17146,7 +17332,7 @@ ;;;*** -;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19423 37200)) +;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19775 2029)) ;;; Generated autoloads from mh-e/mh-e.el (put 'mh-progs 'risky-local-variable t) @@ -17163,7 +17349,7 @@ ;;;*** ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder" -;;;;;; "mh-e/mh-folder.el" (19277 34921)) +;;;;;; "mh-e/mh-folder.el" (19780 4514)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -17245,7 +17431,7 @@ ;;;*** ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight" -;;;;;; "midnight.el" (19369 35251)) +;;;;;; "midnight.el" (19780 4514)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -17272,7 +17458,7 @@ ;;;*** ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef" -;;;;;; "minibuf-eldef.el" (19277 34917)) +;;;;;; "minibuf-eldef.el" (19775 2029)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -17299,7 +17485,7 @@ ;;;*** -;;;### (autoloads (butterfly) "misc" "misc.el" (19668 18610)) +;;;### (autoloads (butterfly) "misc" "misc.el" (19775 2029)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -17318,7 +17504,7 @@ ;;;### (autoloads (multi-isearch-files-regexp multi-isearch-files ;;;;;; multi-isearch-buffers-regexp multi-isearch-buffers multi-isearch-setup) -;;;;;; "misearch" "misearch.el" (19277 34917)) +;;;;;; "misearch" "misearch.el" (19775 2029)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -17400,19 +17586,18 @@ ;;;*** ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el" -;;;;;; (19611 35755)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/mixal-mode.el (autoload 'mixal-mode "mixal-mode" "\ Major mode for the mixal asm language. -\\{mixal-mode-map} \(fn)" t nil) ;;;*** ;;;### (autoloads (mm-inline-external-body mm-extern-cache-contents) -;;;;;; "mm-extern" "gnus/mm-extern.el" (19635 50568)) +;;;;;; "mm-extern" "gnus/mm-extern.el" (19775 2028)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -17431,7 +17616,7 @@ ;;;*** ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el" -;;;;;; (19604 65275)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -17445,7 +17630,7 @@ ;;;*** ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents) -;;;;;; "mm-url" "gnus/mm-url.el" (19582 65302)) +;;;;;; "mm-url" "gnus/mm-url.el" (19780 4513)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -17462,7 +17647,7 @@ ;;;*** ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu" -;;;;;; "gnus/mm-uu.el" (19691 3508)) +;;;;;; "gnus/mm-uu.el" (19775 2028)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -17482,7 +17667,7 @@ ;;;*** ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el" -;;;;;; (19635 50568)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -17499,7 +17684,7 @@ ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt ;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt) -;;;;;; "mml2015" "gnus/mml2015.el" (19687 6902)) +;;;;;; "mml2015" "gnus/mml2015.el" (19780 4513)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -17539,8 +17724,8 @@ ;;;*** -;;;### (autoloads (m2-mode) "modula2" "progmodes/modula2.el" (19676 -;;;;;; 36176)) +;;;### (autoloads (m2-mode) "modula2" "progmodes/modula2.el" (19763 +;;;;;; 27287)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -17574,7 +17759,7 @@ ;;;*** ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el" -;;;;;; (19277 34922)) +;;;;;; (19775 2029)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -17590,7 +17775,7 @@ ;;;*** ;;;### (autoloads (mouse-drag-drag mouse-drag-throw) "mouse-drag" -;;;;;; "mouse-drag.el" (19672 56753)) +;;;;;; "mouse-drag.el" (19775 2029)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -17637,8 +17822,8 @@ ;;;*** -;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19687 -;;;;;; 6902)) +;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from mouse-sel.el (defvar mouse-sel-mode nil "\ @@ -17690,7 +17875,7 @@ ;;;*** -;;;### (autoloads (mpc) "mpc" "mpc.el" (19373 24504)) +;;;### (autoloads (mpc) "mpc" "mpc.el" (19775 2029)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -17700,7 +17885,7 @@ ;;;*** -;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19634 23255)) +;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19775 2029)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -17710,7 +17895,7 @@ ;;;*** -;;;### (autoloads (msb-mode) "msb" "msb.el" (19277 34917)) +;;;### (autoloads (msb-mode) "msb" "msb.el" (19780 45051)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -17732,12 +17917,20 @@ ;;;*** +;;;### (autoloads nil "mule-cmds" "international/mule-cmds.el" (19775 +;;;;;; 2028)) +;;; Generated autoloads from international/mule-cmds.el + +(put 'input-method-alist 'risky-local-variable t) + +;;;*** + ;;;### (autoloads (font-show-log mule-diag list-input-methods list-fontsets ;;;;;; describe-fontset describe-font list-coding-categories list-coding-systems ;;;;;; describe-current-coding-system describe-current-coding-system-briefly ;;;;;; describe-coding-system describe-character-set list-charset-chars ;;;;;; read-charset list-character-sets) "mule-diag" "international/mule-diag.el" -;;;;;; (19617 12132)) +;;;;;; (19775 2028)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -17874,7 +18067,7 @@ ;;;;;; coding-system-translation-table-for-decode coding-system-pre-write-conversion ;;;;;; coding-system-post-read-conversion lookup-nested-alist set-nested-alist ;;;;;; truncate-string-to-width store-substring string-to-sequence) -;;;;;; "mule-util" "international/mule-util.el" (19472 31430)) +;;;;;; "mule-util" "international/mule-util.el" (19775 2028)) ;;; Generated autoloads from international/mule-util.el (autoload 'string-to-sequence "mule-util" "\ @@ -18014,8 +18207,8 @@ ;;;### (autoloads (network-connection network-connection-to-service ;;;;;; whois-reverse-lookup whois finger ftp run-dig dns-lookup-host ;;;;;; nslookup nslookup-host ping traceroute route arp netstat -;;;;;; iwconfig ifconfig) "net-utils" "net/net-utils.el" (19672 -;;;;;; 41548)) +;;;;;; iwconfig ifconfig) "net-utils" "net/net-utils.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -18109,8 +18302,8 @@ ;;;*** -;;;### (autoloads (netrc-credentials) "netrc" "net/netrc.el" (19621 -;;;;;; 23882)) +;;;### (autoloads (netrc-credentials) "netrc" "net/netrc.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -18127,7 +18320,7 @@ ;;;;;; uncomment-region comment-kill comment-set-column comment-indent ;;;;;; comment-indent-default comment-normalize-vars comment-multi-line ;;;;;; comment-padding comment-style comment-column) "newcomment" -;;;;;; "newcomment.el" (19648 59284)) +;;;;;; "newcomment.el" (19775 2029)) ;;; Generated autoloads from newcomment.el (defalias 'indent-for-comment 'comment-indent) @@ -18327,7 +18520,7 @@ ;;;*** ;;;### (autoloads (newsticker-start newsticker-running-p) "newst-backend" -;;;;;; "net/newst-backend.el" (19580 19536)) +;;;;;; "net/newst-backend.el" (19780 4514)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -18349,7 +18542,7 @@ ;;;*** ;;;### (autoloads (newsticker-plainview) "newst-plainview" "net/newst-plainview.el" -;;;;;; (19580 19536)) +;;;;;; (19780 4514)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -18360,7 +18553,7 @@ ;;;*** ;;;### (autoloads (newsticker-show-news) "newst-reader" "net/newst-reader.el" -;;;;;; (19580 19536)) +;;;;;; (19780 4514)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -18371,7 +18564,7 @@ ;;;*** ;;;### (autoloads (newsticker-start-ticker newsticker-ticker-running-p) -;;;;;; "newst-ticker" "net/newst-ticker.el" (19580 19536)) +;;;;;; "newst-ticker" "net/newst-ticker.el" (19780 4514)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -18392,7 +18585,7 @@ ;;;*** ;;;### (autoloads (newsticker-treeview) "newst-treeview" "net/newst-treeview.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2029)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -18403,7 +18596,7 @@ ;;;*** ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el" -;;;;;; (19664 37038)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -18413,8 +18606,8 @@ ;;;*** -;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (19661 -;;;;;; 61255)) +;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -18429,7 +18622,7 @@ ;;;*** ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el" -;;;;;; (19695 9549)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -18441,7 +18634,7 @@ ;;;*** ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el" -;;;;;; (19695 9549)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -18452,7 +18645,7 @@ ;;;*** ;;;### (autoloads (disable-command enable-command disabled-command-function) -;;;;;; "novice" "novice.el" (19687 6902)) +;;;;;; "novice" "novice.el" (19775 2029)) ;;; Generated autoloads from novice.el (defvar disabled-command-function 'disabled-command-function "\ @@ -18485,7 +18678,7 @@ ;;;*** ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el" -;;;;;; (19604 6253)) +;;;;;; (19780 4514)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -18500,7 +18693,7 @@ ;;;*** ;;;### (autoloads (nxml-glyph-display-string) "nxml-glyph" "nxml/nxml-glyph.el" -;;;;;; (19277 34921)) +;;;;;; (19775 2029)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -18512,8 +18705,8 @@ ;;;*** -;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19696 -;;;;;; 28661)) +;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -18575,7 +18768,7 @@ ;;;*** ;;;### (autoloads (nxml-enable-unicode-char-name-sets) "nxml-uchnm" -;;;;;; "nxml/nxml-uchnm.el" (19691 9263)) +;;;;;; "nxml/nxml-uchnm.el" (19775 2029)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -18591,12 +18784,13 @@ ;;;;;; org-babel-next-src-block org-babel-goto-named-result org-babel-goto-named-src-block ;;;;;; org-babel-goto-src-block-head org-babel-hide-result-toggle-maybe ;;;;;; org-babel-sha1-hash org-babel-execute-subtree org-babel-execute-buffer -;;;;;; org-babel-open-src-block-result org-babel-switch-to-session-with-code -;;;;;; org-babel-switch-to-session org-babel-initiate-session org-babel-load-in-session -;;;;;; org-babel-expand-src-block org-babel-execute-src-block org-babel-pop-to-session-maybe +;;;;;; org-babel-map-src-blocks org-babel-open-src-block-result +;;;;;; org-babel-switch-to-session-with-code org-babel-switch-to-session +;;;;;; org-babel-initiate-session org-babel-load-in-session org-babel-expand-src-block +;;;;;; org-babel-execute-src-block org-babel-pop-to-session-maybe ;;;;;; org-babel-load-in-session-maybe org-babel-expand-src-block-maybe ;;;;;; org-babel-execute-maybe org-babel-execute-safely-maybe) "ob" -;;;;;; "org/ob.el" (19677 59043)) +;;;;;; "org/ob.el" (19775 2029)) ;;; Generated autoloads from org/ob.el (autoload 'org-babel-execute-safely-maybe "ob" "\ @@ -18693,6 +18887,32 @@ \(fn &optional RE-RUN)" t nil) +(autoload 'org-babel-map-src-blocks "ob" "\ +Evaluate BODY forms on each source-block in FILE. +If FILE is nil evaluate BODY forms on source blocks in current +buffer. During evaluation of BODY the following local variables +are set relative to the currently matched code block. + +full-block ------- string holding the entirety of the code block +beg-block -------- point at the beginning of the code block +end-block -------- point at the end of the matched code block +lang ------------- string holding the language of the code block +beg-lang --------- point at the beginning of the lang +end-lang --------- point at the end of the lang +switches --------- string holding the switches +beg-switches ----- point at the beginning of the switches +end-switches ----- point at the end of the switches +header-args ------ string holding the header-args +beg-header-args -- point at the beginning of the header-args +end-header-args -- point at the end of the header-args +body ------------- string holding the body of the code block +beg-body --------- point at the beginning of the body +end-body --------- point at the end of the body + +\(fn FILE &rest BODY)" nil (quote macro)) + +(put 'org-babel-map-src-blocks 'lisp-indent-function '1) + (autoload 'org-babel-execute-buffer "ob" "\ Execute source code blocks in a buffer. Call `org-babel-execute-src-block' on every source block in @@ -18752,7 +18972,7 @@ ;;;*** ;;;### (autoloads (org-babel-describe-bindings) "ob-keys" "org/ob-keys.el" -;;;;;; (19676 49793)) +;;;;;; (19775 2029)) ;;; Generated autoloads from org/ob-keys.el (autoload 'org-babel-describe-bindings "ob-keys" "\ @@ -18763,7 +18983,7 @@ ;;;*** ;;;### (autoloads (org-babel-lob-get-info org-babel-lob-execute-maybe -;;;;;; org-babel-lob-ingest) "ob-lob" "org/ob-lob.el" (19677 59221)) +;;;;;; org-babel-lob-ingest) "ob-lob" "org/ob-lob.el" (19775 2029)) ;;; Generated autoloads from org/ob-lob.el (autoload 'org-babel-lob-ingest "ob-lob" "\ @@ -18788,7 +19008,7 @@ ;;;### (autoloads (org-babel-tangle org-babel-tangle-file org-babel-load-file ;;;;;; org-babel-tangle-lang-exts) "ob-tangle" "org/ob-tangle.el" -;;;;;; (19676 49793)) +;;;;;; (19775 2029)) ;;; Generated autoloads from org/ob-tangle.el (defvar org-babel-tangle-lang-exts '(("emacs-lisp" . "el")) "\ @@ -18806,7 +19026,7 @@ `org-babel-tangle' and then loads the resulting file using `load-file'. -\(fn FILE)" nil nil) +\(fn FILE)" t nil) (autoload 'org-babel-tangle-file "ob-tangle" "\ Extract the bodies of source code blocks in FILE. @@ -18830,7 +19050,7 @@ ;;;*** ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el" -;;;;;; (19580 19536)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/octave-inf.el (autoload 'inferior-octave "octave-inf" "\ @@ -18853,7 +19073,7 @@ ;;;*** ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el" -;;;;;; (19687 6902)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/octave-mod.el (autoload 'octave-mode "octave-mod" "\ @@ -18941,7 +19161,7 @@ ;;;;;; org-insert-link-global org-store-link org-run-like-in-org-mode ;;;;;; turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle ;;;;;; org-mode org-babel-do-load-languages) "org" "org/org.el" -;;;;;; (19676 49793)) +;;;;;; (19780 4514)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19164,7 +19384,7 @@ ;;;;;; org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda -;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (19676 49793)) +;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (19780 4514)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-agenda "org-agenda" "\ @@ -19271,13 +19491,13 @@ agenda instead. With a numeric prefix argument in an interactive call, the agenda will -span INCLUDE-ALL days. Lisp programs should instead specify NDAYS to change -the number of days. NDAYS defaults to `org-agenda-ndays'. +span INCLUDE-ALL days. Lisp programs should instead specify SPAN to change +the number of days. SPAN defaults to `org-agenda-span'. START-DAY defaults to TODAY, or to the most recent match for the weekday given in `org-agenda-start-on-weekday'. -\(fn &optional INCLUDE-ALL START-DAY NDAYS)" t nil) +\(fn &optional INCLUDE-ALL START-DAY SPAN)" t nil) (autoload 'org-search-view "org-agenda" "\ Show all entries that contain a phrase or words or regular expressions. @@ -19414,7 +19634,7 @@ ;;;### (autoloads (org-archive-subtree-default-with-confirmation ;;;;;; org-archive-subtree-default) "org-archive" "org/org-archive.el" -;;;;;; (19676 49793)) +;;;;;; (19780 4514)) ;;; Generated autoloads from org/org-archive.el (autoload 'org-archive-subtree-default "org-archive" "\ @@ -19434,8 +19654,8 @@ ;;;### (autoloads (org-export-as-ascii org-export-region-as-ascii ;;;;;; org-replace-region-by-ascii org-export-as-ascii-to-buffer ;;;;;; org-export-as-utf8-to-buffer org-export-as-utf8 org-export-as-latin1-to-buffer -;;;;;; org-export-as-latin1) "org-ascii" "org/org-ascii.el" (19676 -;;;;;; 49793)) +;;;;;; org-export-as-latin1) "org-ascii" "org/org-ascii.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from org/org-ascii.el (autoload 'org-export-as-latin1 "org-ascii" "\ @@ -19508,8 +19728,8 @@ ;;;*** -;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (19676 -;;;;;; 49793)) +;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from org/org-attach.el (autoload 'org-attach "org-attach" "\ @@ -19521,7 +19741,7 @@ ;;;*** ;;;### (autoloads (org-bbdb-anniversaries) "org-bbdb" "org/org-bbdb.el" -;;;;;; (19676 49793)) +;;;;;; (19780 4514)) ;;; Generated autoloads from org/org-bbdb.el (autoload 'org-bbdb-anniversaries "org-bbdb" "\ @@ -19532,7 +19752,7 @@ ;;;*** ;;;### (autoloads (org-capture-import-remember-templates org-capture-insert-template-here -;;;;;; org-capture) "org-capture" "org/org-capture.el" (19678 1813)) +;;;;;; org-capture) "org-capture" "org/org-capture.el" (19775 2029)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture "org-capture" "\ @@ -19570,7 +19790,7 @@ ;;;*** ;;;### (autoloads (org-clock-persistence-insinuate org-get-clocktable) -;;;;;; "org-clock" "org/org-clock.el" (19676 49793)) +;;;;;; "org-clock" "org/org-clock.el" (19780 4514)) ;;; Generated autoloads from org/org-clock.el (autoload 'org-get-clocktable "org-clock" "\ @@ -19588,7 +19808,7 @@ ;;;*** ;;;### (autoloads (org-datetree-find-date-create) "org-datetree" -;;;;;; "org/org-datetree.el" (19676 49793)) +;;;;;; "org/org-datetree.el" (19775 2029)) ;;; Generated autoloads from org/org-datetree.el (autoload 'org-datetree-find-date-create "org-datetree" "\ @@ -19604,7 +19824,7 @@ ;;;### (autoloads (org-export-as-docbook org-export-as-docbook-pdf-and-open ;;;;;; org-export-as-docbook-pdf org-export-region-as-docbook org-replace-region-by-docbook ;;;;;; org-export-as-docbook-to-buffer org-export-as-docbook-batch) -;;;;;; "org-docbook" "org/org-docbook.el" (19676 49793)) +;;;;;; "org-docbook" "org/org-docbook.el" (19775 2029)) ;;; Generated autoloads from org/org-docbook.el (autoload 'org-export-as-docbook-batch "org-docbook" "\ @@ -19681,7 +19901,7 @@ ;;;### (autoloads (org-insert-export-options-template org-export-as-org ;;;;;; org-export-visible org-export) "org-exp" "org/org-exp.el" -;;;;;; (19676 49793)) +;;;;;; (19780 4514)) ;;; Generated autoloads from org/org-exp.el (autoload 'org-export "org-exp" "\ @@ -19738,8 +19958,8 @@ ;;;*** ;;;### (autoloads (org-feed-show-raw-feed org-feed-goto-inbox org-feed-update -;;;;;; org-feed-update-all) "org-feed" "org/org-feed.el" (19676 -;;;;;; 49793)) +;;;;;; org-feed-update-all) "org-feed" "org/org-feed.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from org/org-feed.el (autoload 'org-feed-update-all "org-feed" "\ @@ -19767,7 +19987,7 @@ ;;;*** ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote" -;;;;;; "org/org-footnote.el" (19676 49793)) +;;;;;; "org/org-footnote.el" (19775 2029)) ;;; Generated autoloads from org/org-footnote.el (autoload 'org-footnote-action "org-footnote" "\ @@ -19794,7 +20014,7 @@ ;;;### (autoloads (org-freemind-to-org-mode org-freemind-from-org-sparse-tree ;;;;;; org-freemind-from-org-mode org-freemind-from-org-mode-node ;;;;;; org-freemind-show org-export-as-freemind) "org-freemind" -;;;;;; "org/org-freemind.el" (19676 49793)) +;;;;;; "org/org-freemind.el" (19775 2029)) ;;; Generated autoloads from org/org-freemind.el (autoload 'org-export-as-freemind "org-freemind" "\ @@ -19855,7 +20075,7 @@ ;;;### (autoloads (org-export-htmlize-generate-css org-export-as-html ;;;;;; org-export-region-as-html org-replace-region-by-html org-export-as-html-to-buffer ;;;;;; org-export-as-html-batch org-export-as-html-and-open) "org-html" -;;;;;; "org/org-html.el" (19676 49793)) +;;;;;; "org/org-html.el" (19780 4514)) ;;; Generated autoloads from org/org-html.el (put 'org-export-html-style-include-default 'safe-local-variable 'booleanp) @@ -19949,7 +20169,7 @@ ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files ;;;;;; org-export-icalendar-this-file) "org-icalendar" "org/org-icalendar.el" -;;;;;; (19676 49793)) +;;;;;; (19780 4514)) ;;; Generated autoloads from org/org-icalendar.el (autoload 'org-export-icalendar-this-file "org-icalendar" "\ @@ -19977,7 +20197,7 @@ ;;;### (autoloads (org-id-store-link org-id-find-id-file org-id-find ;;;;;; org-id-goto org-id-get-with-outline-drilling org-id-get-with-outline-path-completion ;;;;;; org-id-get org-id-copy org-id-get-create) "org-id" "org/org-id.el" -;;;;;; (19676 49793)) +;;;;;; (19775 2029)) ;;; Generated autoloads from org/org-id.el (autoload 'org-id-get-create "org-id" "\ @@ -20046,7 +20266,7 @@ ;;;*** ;;;### (autoloads (org-indent-mode) "org-indent" "org/org-indent.el" -;;;;;; (19676 49793)) +;;;;;; (19775 2029)) ;;; Generated autoloads from org/org-indent.el (autoload 'org-indent-mode "org-indent" "\ @@ -20061,7 +20281,7 @@ ;;;*** ;;;### (autoloads (org-irc-store-link) "org-irc" "org/org-irc.el" -;;;;;; (19676 49793)) +;;;;;; (19775 2029)) ;;; Generated autoloads from org/org-irc.el (autoload 'org-irc-store-link "org-irc" "\ @@ -20074,7 +20294,7 @@ ;;;### (autoloads (org-export-as-pdf-and-open org-export-as-pdf org-export-as-latex ;;;;;; org-export-region-as-latex org-replace-region-by-latex org-export-as-latex-to-buffer ;;;;;; org-export-as-latex-batch) "org-latex" "org/org-latex.el" -;;;;;; (19676 49793)) +;;;;;; (19775 2029)) ;;; Generated autoloads from org/org-latex.el (autoload 'org-export-as-latex-batch "org-latex" "\ @@ -20154,8 +20374,8 @@ ;;;*** ;;;### (autoloads (org-mobile-create-sumo-agenda org-mobile-pull -;;;;;; org-mobile-push) "org-mobile" "org/org-mobile.el" (19676 -;;;;;; 49793)) +;;;;;; org-mobile-push) "org-mobile" "org/org-mobile.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from org/org-mobile.el (autoload 'org-mobile-push "org-mobile" "\ @@ -20180,7 +20400,7 @@ ;;;*** ;;;### (autoloads (org-plot/gnuplot) "org-plot" "org/org-plot.el" -;;;;;; (19676 49793)) +;;;;;; (19775 2029)) ;;; Generated autoloads from org/org-plot.el (autoload 'org-plot/gnuplot "org-plot" "\ @@ -20194,7 +20414,7 @@ ;;;### (autoloads (org-publish-current-project org-publish-current-file ;;;;;; org-publish-all org-publish) "org-publish" "org/org-publish.el" -;;;;;; (19676 49793)) +;;;;;; (19780 4514)) ;;; Generated autoloads from org/org-publish.el (defalias 'org-publish-project 'org-publish) @@ -20228,7 +20448,7 @@ ;;;### (autoloads (org-remember-handler org-remember org-remember-apply-template ;;;;;; org-remember-annotation org-remember-insinuate) "org-remember" -;;;;;; "org/org-remember.el" (19676 49793)) +;;;;;; "org/org-remember.el" (19780 4514)) ;;; Generated autoloads from org/org-remember.el (autoload 'org-remember-insinuate "org-remember" "\ @@ -20304,7 +20524,7 @@ ;;;*** ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl) -;;;;;; "org-table" "org/org-table.el" (19676 49793)) +;;;;;; "org-table" "org/org-table.el" (19780 4514)) ;;; Generated autoloads from org/org-table.el (autoload 'turn-on-orgtbl "org-table" "\ @@ -20328,7 +20548,7 @@ ;;;*** ;;;### (autoloads (org-export-as-taskjuggler-and-open org-export-as-taskjuggler) -;;;;;; "org-taskjuggler" "org/org-taskjuggler.el" (19676 49793)) +;;;;;; "org-taskjuggler" "org/org-taskjuggler.el" (19775 2029)) ;;; Generated autoloads from org/org-taskjuggler.el (autoload 'org-export-as-taskjuggler "org-taskjuggler" "\ @@ -20356,7 +20576,7 @@ ;;;### (autoloads (org-timer-set-timer org-timer-item org-timer-change-times-in-region ;;;;;; org-timer org-timer-start) "org-timer" "org/org-timer.el" -;;;;;; (19676 49793)) +;;;;;; (19775 2029)) ;;; Generated autoloads from org/org-timer.el (autoload 'org-timer-start "org-timer" "\ @@ -20417,7 +20637,7 @@ ;;;*** ;;;### (autoloads (org-export-as-xoxo) "org-xoxo" "org/org-xoxo.el" -;;;;;; (19676 49793)) +;;;;;; (19780 4514)) ;;; Generated autoloads from org/org-xoxo.el (autoload 'org-export-as-xoxo "org-xoxo" "\ @@ -20429,7 +20649,7 @@ ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (19622 9855)) +;;;;;; (19775 2029)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'string-or-null-p) @@ -20489,7 +20709,7 @@ ;;;### (autoloads (list-packages describe-package package-initialize ;;;;;; package-install-file package-install-from-buffer package-install ;;;;;; package-enable-at-startup) "package" "emacs-lisp/package.el" -;;;;;; (19675 5423)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/package.el (defvar package-enable-at-startup t "\ @@ -20551,7 +20771,7 @@ ;;;*** -;;;### (autoloads (show-paren-mode) "paren" "paren.el" (19648 63605)) +;;;### (autoloads (show-paren-mode) "paren" "paren.el" (19775 2029)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20576,7 +20796,7 @@ ;;;*** ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2027)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20589,8 +20809,8 @@ ;;;*** -;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19670 -;;;;;; 1520)) +;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20643,7 +20863,7 @@ ;;;*** ;;;### (autoloads (password-cache-expiry password-cache) "password-cache" -;;;;;; "password-cache.el" (19582 65302)) +;;;;;; "password-cache.el" (19775 2029)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20660,7 +20880,7 @@ ;;;*** ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emulation/pc-mode.el (autoload 'pc-bindings-mode "pc-mode" "\ @@ -20678,7 +20898,7 @@ ;;;*** ;;;### (autoloads (pc-selection-mode) "pc-select" "emulation/pc-select.el" -;;;;;; (19609 2166)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emulation/pc-select.el (defvar pc-selection-mode nil "\ @@ -20745,7 +20965,7 @@ ;;;*** ;;;### (autoloads (pcase-let pcase-let* pcase) "pcase" "emacs-lisp/pcase.el" -;;;;;; (19693 26133)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20801,8 +21021,8 @@ ;;;*** -;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (19580 -;;;;;; 19536)) +;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20813,7 +21033,7 @@ ;;;*** ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip) -;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (19580 19536)) +;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (19775 2029)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20841,7 +21061,7 @@ ;;;*** ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill) -;;;;;; "pcmpl-linux" "pcmpl-linux.el" (19580 19536)) +;;;;;; "pcmpl-linux" "pcmpl-linux.el" (19775 2029)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20861,8 +21081,8 @@ ;;;*** -;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (19580 -;;;;;; 19536)) +;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20874,7 +21094,7 @@ ;;;### (autoloads (pcomplete/scp pcomplete/ssh pcomplete/chgrp pcomplete/chown ;;;;;; pcomplete/which pcomplete/xargs pcomplete/rm pcomplete/rmdir -;;;;;; pcomplete/cd) "pcmpl-unix" "pcmpl-unix.el" (19580 19536)) +;;;;;; pcomplete/cd) "pcmpl-unix" "pcmpl-unix.el" (19775 2029)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20931,8 +21151,8 @@ ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list ;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete -;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19451 -;;;;;; 17238)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20991,7 +21211,7 @@ ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status ;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs" -;;;;;; "vc/pcvs.el" (19474 36901)) +;;;;;; "vc/pcvs.el" (19775 2030)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -21066,7 +21286,7 @@ ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (19580 19536)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (19780 4514)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m))) @@ -21074,7 +21294,7 @@ ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (19668 19310)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -21135,155 +21355,8 @@ ;;;*** -;;;### (autoloads (pgg-snarf-keys pgg-snarf-keys-region pgg-insert-key -;;;;;; pgg-verify pgg-verify-region pgg-sign pgg-sign-region pgg-decrypt -;;;;;; pgg-decrypt-region pgg-encrypt pgg-encrypt-symmetric pgg-encrypt-symmetric-region -;;;;;; pgg-encrypt-region) "pgg" "pgg.el" (19635 50568)) -;;; Generated autoloads from pgg.el - -(autoload 'pgg-encrypt-region "pgg" "\ -Encrypt the current region between START and END for RCPTS. - -If optional argument SIGN is non-nil, do a combined sign and encrypt. - -If optional PASSPHRASE is not specified, it will be obtained from the -passphrase cache or user. - -\(fn START END RCPTS &optional SIGN PASSPHRASE)" t nil) - -(autoload 'pgg-encrypt-symmetric-region "pgg" "\ -Encrypt the current region between START and END symmetric with passphrase. - -If optional PASSPHRASE is not specified, it will be obtained from the -cache or user. - -\(fn START END &optional PASSPHRASE)" t nil) - -(autoload 'pgg-encrypt-symmetric "pgg" "\ -Encrypt the current buffer using a symmetric, rather than key-pair, cipher. - -If optional arguments START and END are specified, only encrypt within -the region. - -If optional PASSPHRASE is not specified, it will be obtained from the -passphrase cache or user. - -\(fn &optional START END PASSPHRASE)" t nil) - -(autoload 'pgg-encrypt "pgg" "\ -Encrypt the current buffer for RCPTS. - -If optional argument SIGN is non-nil, do a combined sign and encrypt. - -If optional arguments START and END are specified, only encrypt within -the region. - -If optional PASSPHRASE is not specified, it will be obtained from the -passphrase cache or user. - -\(fn RCPTS &optional SIGN START END PASSPHRASE)" t nil) - -(autoload 'pgg-decrypt-region "pgg" "\ -Decrypt the current region between START and END. - -If optional PASSPHRASE is not specified, it will be obtained from the -passphrase cache or user. - -\(fn START END &optional PASSPHRASE)" t nil) - -(autoload 'pgg-decrypt "pgg" "\ -Decrypt the current buffer. - -If optional arguments START and END are specified, only decrypt within -the region. - -If optional PASSPHRASE is not specified, it will be obtained from the -passphrase cache or user. - -\(fn &optional START END PASSPHRASE)" t nil) - -(autoload 'pgg-sign-region "pgg" "\ -Make the signature from text between START and END. - -If the optional 3rd argument CLEARTEXT is non-nil, it does not create -a detached signature. - -If this function is called interactively, CLEARTEXT is enabled -and the output is displayed. - -If optional PASSPHRASE is not specified, it will be obtained from the -passphrase cache or user. - -\(fn START END &optional CLEARTEXT PASSPHRASE)" t nil) - -(autoload 'pgg-sign "pgg" "\ -Sign the current buffer. - -If the optional argument CLEARTEXT is non-nil, it does not create a -detached signature. - -If optional arguments START and END are specified, only sign data -within the region. - -If this function is called interactively, CLEARTEXT is enabled -and the output is displayed. - -If optional PASSPHRASE is not specified, it will be obtained from the -passphrase cache or user. - -\(fn &optional CLEARTEXT START END PASSPHRASE)" t nil) - -(autoload 'pgg-verify-region "pgg" "\ -Verify the current region between START and END. -If the optional 3rd argument SIGNATURE is non-nil, it is treated as -the detached signature of the current region. - -If the optional 4th argument FETCH is non-nil, we attempt to fetch the -signer's public key from `pgg-default-keyserver-address'. - -\(fn START END &optional SIGNATURE FETCH)" t nil) - -(autoload 'pgg-verify "pgg" "\ -Verify the current buffer. -If the optional argument SIGNATURE is non-nil, it is treated as -the detached signature of the current region. -If the optional argument FETCH is non-nil, we attempt to fetch the -signer's public key from `pgg-default-keyserver-address'. -If optional arguments START and END are specified, only verify data -within the region. - -\(fn &optional SIGNATURE FETCH START END)" t nil) - -(autoload 'pgg-insert-key "pgg" "\ -Insert the ASCII armored public key. - -\(fn)" t nil) - -(autoload 'pgg-snarf-keys-region "pgg" "\ -Import public keys in the current region between START and END. - -\(fn START END)" t nil) - -(autoload 'pgg-snarf-keys "pgg" "\ -Import public keys in the current buffer. - -\(fn)" t nil) - -;;;*** - -;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el" -;;;;;; (19582 65302)) -;;; Generated autoloads from pgg-gpg.el - -(autoload 'pgg-gpg-symmetric-key-p "pgg-gpg" "\ -True if decoded armor MESSAGE-KEYS has symmetric encryption indicator. - -\(fn MESSAGE-KEYS)" nil nil) - -;;;*** - ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el" -;;;;;; (19687 6902)) +;;;;;; (19775 2030)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -21364,7 +21437,7 @@ ;;;*** ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el" -;;;;;; (19277 34923)) +;;;;;; (19775 2030)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -21375,7 +21448,7 @@ ;;;*** -;;;### (autoloads (pong) "pong" "play/pong.el" (19277 34922)) +;;;### (autoloads (pong) "pong" "play/pong.el" (19775 2029)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -21391,7 +21464,7 @@ ;;;*** -;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (19624 59837)) +;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (19775 2028)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -21404,7 +21477,7 @@ ;;;### (autoloads (pp-macroexpand-last-sexp pp-eval-last-sexp pp-macroexpand-expression ;;;;;; pp-eval-expression pp pp-buffer pp-to-string) "pp" "emacs-lisp/pp.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -21472,7 +21545,7 @@ ;;;;;; pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview ;;;;;; pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript ;;;;;; pr-ps-directory-preview pr-interface) "printing" "printing.el" -;;;;;; (19687 6902)) +;;;;;; (19775 2029)) ;;; Generated autoloads from printing.el (autoload 'pr-interface "printing" "\ @@ -22059,7 +22132,7 @@ ;;;*** -;;;### (autoloads (proced) "proced" "proced.el" (19590 30214)) +;;;### (autoloads (proced) "proced" "proced.el" (19775 2029)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -22074,13 +22147,21 @@ ;;;*** -;;;### (autoloads (switch-to-prolog prolog-mode) "prolog" "progmodes/prolog.el" -;;;;;; (19672 21006)) +;;;### (autoloads (run-prolog mercury-mode prolog-mode) "prolog" +;;;;;; "progmodes/prolog.el" (19780 4514)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ -Major mode for editing Prolog code for Prologs. -Blank lines and `%%...' separate paragraphs. `%'s start comments. +Major mode for editing Prolog code. + +Blank lines and `%%...' separate paragraphs. `%'s starts a comment +line and comments can also be enclosed in /* ... */. + +If an optional argument SYSTEM is non-nil, set up mode for the given system. + +To find out what version of Prolog mode you are running, enter +`\\[prolog-mode-version]'. + Commands: \\{prolog-mode-map} Entry to this mode calls the value of `prolog-mode-hook' @@ -22088,18 +22169,62 @@ \(fn)" t nil) -(defalias 'run-prolog 'switch-to-prolog) - -(autoload 'switch-to-prolog "prolog" "\ +(autoload 'mercury-mode "prolog" "\ +Major mode for editing Mercury programs. +Actually this is just customized `prolog-mode'. + +\(fn)" t nil) + +(autoload 'run-prolog "prolog" "\ Run an inferior Prolog process, input and output via buffer *prolog*. -With prefix argument \\[universal-prefix], prompt for the program to use. - -\(fn &optional NAME)" t nil) - -;;;*** - -;;;### (autoloads (bdf-directory-list) "ps-bdf" "ps-bdf.el" (19580 -;;;;;; 19536)) +With prefix argument ARG, restart the Prolog process if running before. + +\(fn ARG)" t nil) + +;;;*** + +;;;### (autoloads (open-protocol-stream) "proto-stream" "gnus/proto-stream.el" +;;;;;; (19780 4513)) +;;; Generated autoloads from gnus/proto-stream.el + +(autoload 'open-protocol-stream "proto-stream" "\ +Open a network stream to HOST, upgrading to STARTTLS if possible. +The first four parameters have the same meaning as in +`open-network-stream'. The function returns a list where the +first element is the stream, the second element is the greeting +the server replied with after connecting, and the third element +is a string representing the capabilities of the server (if any). + +The PARAMETERS is a keyword list that can have the following +values: + +:type -- either `network', `network-only, `tls', `shell' or +`starttls'. If omitted, the default is `network'. `network' +will be opportunistically upgraded to STARTTLS if both the server +and Emacs supports it. If you don't want STARTTLS upgrades, use +`network-only'. + +:end-of-command -- a regexp saying what the end of a command is. +This defaults to \"\\n\". + +:success -- a regexp saying whether the STARTTLS command was +successful or not. For instance, for NNTP this is \"^3\". + +:capability-command -- a string representing the command used to +query server for capabilities. For instance, for IMAP this is +\"1 CAPABILITY\\r\\n\". + +:starttls-function -- a function that takes one parameter, which +is the response to the capaibility command. It should return nil +if it turns out that the server doesn't support STARTTLS, or the +command to switch on STARTTLS otherwise. + +\(fn NAME BUFFER HOST SERVICE &rest PARAMETERS)" nil nil) + +;;;*** + +;;;### (autoloads (bdf-directory-list) "ps-bdf" "ps-bdf.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ @@ -22110,8 +22235,8 @@ ;;;*** -;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19580 -;;;;;; 19536)) +;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from progmodes/ps-mode.el (autoload 'ps-mode "ps-mode" "\ @@ -22162,8 +22287,8 @@ ;;;;;; ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer ;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces ;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type -;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (19648 -;;;;;; 63513)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from ps-print.el (defvar ps-page-dimensions-database (purecopy (list (list 'a4 (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list 'a3 (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list 'letter (* 72 8.5) (* 72 11.0) "Letter") (list 'legal (* 72 8.5) (* 72 14.0) "Legal") (list 'letter-small (* 72 7.68) (* 72 10.16) "LetterSmall") (list 'tabloid (* 72 11.0) (* 72 17.0) "Tabloid") (list 'ledger (* 72 17.0) (* 72 11.0) "Ledger") (list 'statement (* 72 5.5) (* 72 8.5) "Statement") (list 'executive (* 72 7.5) (* 72 10.0) "Executive") (list 'a4small (* 72 7.47) (* 72 10.85) "A4Small") (list 'b4 (* 72 10.125) (* 72 14.33) "B4") (list 'b5 (* 72 7.16) (* 72 10.125) "B5") '(addresslarge 236.0 99.0 "AddressLarge") '(addresssmall 236.0 68.0 "AddressSmall") '(cuthanging13 90.0 222.0 "CutHanging13") '(cuthanging15 90.0 114.0 "CutHanging15") '(diskette 181.0 136.0 "Diskette") '(eurofilefolder 139.0 112.0 "EuropeanFilefolder") '(eurofoldernarrow 526.0 107.0 "EuroFolderNarrow") '(eurofolderwide 526.0 136.0 "EuroFolderWide") '(euronamebadge 189.0 108.0 "EuroNameBadge") '(euronamebadgelarge 223.0 136.0 "EuroNameBadgeLarge") '(filefolder 230.0 37.0 "FileFolder") '(jewelry 76.0 136.0 "Jewelry") '(mediabadge 180.0 136.0 "MediaBadge") '(multipurpose 126.0 68.0 "MultiPurpose") '(retaillabel 90.0 104.0 "RetailLabel") '(shipping 271.0 136.0 "Shipping") '(slide35mm 26.0 104.0 "Slide35mm") '(spine8mm 187.0 26.0 "Spine8mm") '(topcoated 425.19685 136.0 "TopCoatedPaper") '(topcoatedpaper 396.0 136.0 "TopcoatedPaper150") '(vhsface 205.0 127.0 "VHSFace") '(vhsspine 400.0 50.0 "VHSSpine") '(zipdisk 156.0 136.0 "ZipDisk"))) "\ @@ -22360,7 +22485,7 @@ ;;;*** ;;;### (autoloads (python-shell jython-mode python-mode run-python) -;;;;;; "python" "progmodes/python.el" (19691 3508)) +;;;;;; "python" "progmodes/python.el" (19780 4514)) ;;; Generated autoloads from progmodes/python.el (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode)) @@ -22371,20 +22496,24 @@ (autoload 'run-python "python" "\ Run an inferior Python process, input and output via buffer *Python*. -CMD is the Python command to run. NOSHOW non-nil means don't show the -buffer automatically. - -Normally, if there is a process already running in `python-buffer', -switch to that buffer. Interactively, a prefix arg allows you to edit -the initial command line (default is `python-command'); `-i' etc. args -will be added to this as appropriate. A new process is started if: -one isn't running attached to `python-buffer', or interactively the -default `python-command', or argument NEW is non-nil. See also the -documentation for `python-buffer'. - -Runs the hook `inferior-python-mode-hook' (after the -`comint-mode-hook' is run). (Type \\[describe-mode] in the process -buffer for a list of commands.) +CMD is the Python command to run. NOSHOW non-nil means don't +show the buffer automatically. + +Interactively, a prefix arg means to prompt for the initial +Python command line (default is `python-command'). + +A new process is started if one isn't running attached to +`python-buffer', or if called from Lisp with non-nil arg NEW. +Otherwise, if a process is already running in `python-buffer', +switch to that buffer. + +This command runs the hook `inferior-python-mode-hook' after +running `comint-mode-hook'. Type \\[describe-mode] in the +process buffer for a list of commands. + +By default, Emacs inhibits the loading of Python modules from the +current working directory, for security reasons. To disable this +behavior, change `python-remove-cwd-from-path' to nil. \(fn &optional CMD NOSHOW NEW)" t nil) @@ -22476,7 +22605,7 @@ ;;;*** ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -22499,7 +22628,7 @@ ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (19498 12592)) +;;;;;; "international/quail.el" (19780 45051)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22730,8 +22859,8 @@ ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (19672 -;;;;;; 56753)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -22803,7 +22932,7 @@ ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (19599 45674)) +;;;;;; "net/rcirc.el" (19780 4514)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22838,8 +22967,8 @@ ;;;*** -;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (19609 -;;;;;; 2577)) +;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from net/rcompile.el (autoload 'remote-compile "rcompile" "\ @@ -22851,7 +22980,7 @@ ;;;*** ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el" -;;;;;; (19552 37739)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22863,7 +22992,7 @@ ;;;*** -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (19277 34917)) +;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (19775 2029)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22887,11 +23016,11 @@ ;;;*** -;;;### (autoloads (clear-rectangle string-insert-rectangle string-rectangle -;;;;;; delete-whitespace-rectangle open-rectangle insert-rectangle -;;;;;; yank-rectangle kill-rectangle extract-rectangle delete-extract-rectangle -;;;;;; delete-rectangle move-to-column-force) "rect" "rect.el" (19580 -;;;;;; 19536)) +;;;### (autoloads (rectangle-number-lines clear-rectangle string-insert-rectangle +;;;;;; string-rectangle delete-whitespace-rectangle open-rectangle +;;;;;; insert-rectangle yank-rectangle kill-rectangle extract-rectangle +;;;;;; delete-extract-rectangle delete-rectangle) "rect" "rect.el" +;;;;;; (19775 2029)) ;;; Generated autoloads from rect.el (define-key ctl-x-r-map "c" 'clear-rectangle) (define-key ctl-x-r-map "k" 'kill-rectangle) @@ -22899,15 +23028,7 @@ (define-key ctl-x-r-map "y" 'yank-rectangle) (define-key ctl-x-r-map "o" 'open-rectangle) (define-key ctl-x-r-map "t" 'string-rectangle) - -(autoload 'move-to-column-force "rect" "\ -If COLUMN is within a multi-column character, replace it by spaces and tab. -As for `move-to-column', passing anything but nil or t in FLAG will move to -the desired column only if the line is long enough. - -\(fn COLUMN &optional FLAG)" nil nil) - -(make-obsolete 'move-to-column-force 'move-to-column "21.2") + (define-key ctl-x-r-map "N" 'rectangle-number-lines) (autoload 'delete-rectangle "rect" "\ Delete (don't save) text in the region-rectangle. @@ -23023,10 +23144,20 @@ \(fn START END &optional FILL)" t nil) +(autoload 'rectangle-number-lines "rect" "\ +Insert numbers in front of the region-rectangle. + +START-AT, if non-nil, should be a number from which to begin +counting. FORMAT, if non-nil, should be a format string to pass +to `format' along with the line count. When called interactively +with a prefix argument, prompt for START-AT and FORMAT. + +\(fn START END START-AT &optional FORMAT)" t nil) + ;;;*** -;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (19277 -;;;;;; 34923)) +;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -23042,7 +23173,7 @@ ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (19594 48841)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (19775 2030)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -23092,7 +23223,7 @@ ;;;*** ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el" -;;;;;; (19669 41170)) +;;;;;; (19775 2030)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload 'reftex-citation "reftex-cite" "\ @@ -23122,7 +23253,7 @@ ;;;*** ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2030)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload 'reftex-isearch-minor-mode "reftex-global" "\ @@ -23139,7 +23270,7 @@ ;;;*** ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" -;;;;;; (19664 56235)) +;;;;;; (19775 2030)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload 'reftex-index-phrases-mode "reftex-index" "\ @@ -23165,14 +23296,14 @@ Here are all local bindings. -\\{reftex-index-phrases-map} +\\{reftex-index-phrases-mode-map} \(fn)" t nil) ;;;*** ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (19607 63447)) +;;;;;; (19775 2030)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload 'reftex-all-document-files "reftex-parse" "\ @@ -23184,8 +23315,8 @@ ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19580 -;;;;;; 19536)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -23195,7 +23326,7 @@ ;;;*** ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el" -;;;;;; (19645 60484)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -23226,7 +23357,7 @@ ;;;### (autoloads (remember-diary-extract-entries remember-clipboard ;;;;;; remember-other-frame remember) "remember" "textmodes/remember.el" -;;;;;; (19672 39537)) +;;;;;; (19775 2030)) ;;; Generated autoloads from textmodes/remember.el (autoload 'remember "remember" "\ @@ -23257,7 +23388,7 @@ ;;;*** -;;;### (autoloads (repeat) "repeat" "repeat.el" (19645 60484)) +;;;### (autoloads (repeat) "repeat" "repeat.el" (19775 2029)) ;;; Generated autoloads from repeat.el (autoload 'repeat "repeat" "\ @@ -23280,7 +23411,7 @@ ;;;*** ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el" -;;;;;; (19277 34921)) +;;;;;; (19775 2028)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -23312,7 +23443,7 @@ ;;;*** ;;;### (autoloads (reposition-window) "reposition" "reposition.el" -;;;;;; (19668 19461)) +;;;;;; (19775 2029)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -23339,7 +23470,7 @@ ;;;*** ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el" -;;;;;; (19354 34807)) +;;;;;; (19775 2029)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -23374,7 +23505,7 @@ ;;;*** ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -23389,7 +23520,7 @@ ;;;*** -;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (19609 2536)) +;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (19775 2029)) ;;; Generated autoloads from net/rlogin.el (add-hook 'same-window-regexps (purecopy "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")) @@ -23439,8 +23570,8 @@ ;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers ;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers ;;;;;; rmail-dont-reply-to-names rmail-user-mail-address-regexp -;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19639 -;;;;;; 17158)) +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from mail/rmail.el (autoload 'rmail-movemail-variant-p "rmail" "\ @@ -23634,7 +23765,7 @@ ;;;*** ;;;### (autoloads (rmail-output-body-to-file rmail-output-as-seen -;;;;;; rmail-output) "rmailout" "mail/rmailout.el" (19580 19536)) +;;;;;; rmail-output) "rmailout" "mail/rmailout.el" (19780 4513)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23699,7 +23830,7 @@ ;;;*** ;;;### (autoloads (rng-c-load-schema) "rng-cmpct" "nxml/rng-cmpct.el" -;;;;;; (19277 34921)) +;;;;;; (19775 2029)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23711,7 +23842,7 @@ ;;;*** ;;;### (autoloads (rng-nxml-mode-init) "rng-nxml" "nxml/rng-nxml.el" -;;;;;; (19696 28661)) +;;;;;; (19780 4514)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23724,7 +23855,7 @@ ;;;*** ;;;### (autoloads (rng-validate-mode) "rng-valid" "nxml/rng-valid.el" -;;;;;; (19696 28661)) +;;;;;; (19780 4514)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23754,8 +23885,8 @@ ;;;*** -;;;### (autoloads (rng-xsd-compile) "rng-xsd" "nxml/rng-xsd.el" (19277 -;;;;;; 34921)) +;;;### (autoloads (rng-xsd-compile) "rng-xsd" "nxml/rng-xsd.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23783,7 +23914,7 @@ ;;;*** ;;;### (autoloads (robin-use-package robin-modify-package robin-define-package) -;;;;;; "robin" "international/robin.el" (19277 34920)) +;;;;;; "robin" "international/robin.el" (19763 27286)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -23816,7 +23947,7 @@ ;;;*** ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region -;;;;;; rot13-string rot13) "rot13" "rot13.el" (19277 34917)) +;;;;;; rot13-string rot13) "rot13" "rot13.el" (19775 2029)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23854,7 +23985,7 @@ ;;;*** ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el" -;;;;;; (19687 6902)) +;;;;;; (19780 4514)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23892,7 +24023,7 @@ ;;;*** ;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el" -;;;;;; (19670 666)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/ruby-mode.el (autoload 'ruby-mode "ruby-mode" "\ @@ -23913,8 +24044,8 @@ ;;;*** -;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (19502 -;;;;;; 11548)) +;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from ruler-mode.el (defvar ruler-mode nil "\ @@ -23929,8 +24060,8 @@ ;;;*** -;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (19590 -;;;;;; 30214)) +;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -24236,8 +24367,8 @@ ;;;*** -;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (19423 -;;;;;; 37200)) +;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from savehist.el (defvar savehist-mode nil "\ @@ -24265,7 +24396,7 @@ ;;;*** ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el" -;;;;;; (19561 48711)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -24307,7 +24438,7 @@ ;;;*** ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -24321,7 +24452,7 @@ ;;;*** ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el" -;;;;;; (19433 56975)) +;;;;;; (19775 2029)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -24344,7 +24475,7 @@ ;;;*** ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el" -;;;;;; (19277 34917)) +;;;;;; (19775 2029)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -24358,7 +24489,7 @@ ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (19444 23363)) +;;;### (autoloads nil "secrets" "net/secrets.el" (19775 2029)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) @@ -24366,7 +24497,7 @@ ;;;*** ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic" -;;;;;; "cedet/semantic.el" (19612 4032)) +;;;;;; "cedet/semantic.el" (19775 2027)) ;;; Generated autoloads from cedet/semantic.el (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\ @@ -24411,14 +24542,13 @@ ;;;*** ;;;### (autoloads (mail-other-frame mail-other-window mail mail-mailing-lists -;;;;;; mail-mode mail-send-nonascii mail-bury-selects-summary mail-default-headers +;;;;;; mail-mode sendmail-user-agent-compose mail-default-headers ;;;;;; mail-default-directory mail-signature-file mail-signature ;;;;;; mail-citation-prefix-regexp mail-citation-hook mail-indentation-spaces ;;;;;; mail-yank-prefix mail-setup-hook mail-personal-alias-file -;;;;;; mail-alias-file mail-default-reply-to mail-archive-file-name -;;;;;; mail-header-separator send-mail-function mail-interactive -;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style) -;;;;;; "sendmail" "mail/sendmail.el" (19696 28661)) +;;;;;; mail-default-reply-to mail-archive-file-name mail-header-separator +;;;;;; send-mail-function mail-interactive mail-self-blind mail-specify-envelope-from +;;;;;; mail-from-style) "sendmail" "mail/sendmail.el" (19775 2029)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24493,14 +24623,6 @@ (custom-autoload 'mail-default-reply-to "sendmail" t) -(defvar mail-alias-file nil "\ -If non-nil, the name of a file to use instead of `/usr/lib/aliases'. -This file defines aliases to be expanded by the mailer; this is a different -feature from that of defining aliases in `.mailrc' to be expanded in Emacs. -This variable has no effect unless your system uses sendmail as its mailer.") - -(custom-autoload 'mail-alias-file "sendmail" t) - (defvar mail-personal-alias-file (purecopy "~/.mailrc") "\ If non-nil, the name of the user's personal mail alias file. This file typically should be in same format as the `.mailrc' file used by @@ -24587,24 +24709,12 @@ (custom-autoload 'mail-default-headers "sendmail" t) -(defvar mail-bury-selects-summary t "\ -If non-nil, try to show Rmail summary buffer after returning from mail. -The functions \\[mail-send-on-exit] or \\[mail-dont-send] select -the Rmail summary buffer before returning, if it exists and this variable -is non-nil.") - -(custom-autoload 'mail-bury-selects-summary "sendmail" t) - -(defvar mail-send-nonascii 'mime "\ -Specify whether to allow sending non-ASCII characters in mail. -If t, that means do allow it. nil means don't allow it. -`query' means ask the user each time. -`mime' means add an appropriate MIME header if none already present. -The default is `mime'. -Including non-ASCII characters in a mail message can be problematical -for the recipient, who may not know how to decode them properly.") - -(custom-autoload 'mail-send-nonascii "sendmail" t) +(define-mail-user-agent 'sendmail-user-agent 'sendmail-user-agent-compose 'mail-send-and-exit) + +(autoload 'sendmail-user-agent-compose "sendmail" "\ +Not documented + +\(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-FUNCTION YANK-ACTION SEND-ACTIONS RETURN-ACTION &rest IGNORED)" nil nil) (autoload 'mail-mode "sendmail" "\ Major mode for editing mail to be sent. @@ -24703,7 +24813,7 @@ when the message is sent, we apply FUNCTION to ARGS. This is how Rmail arranges to mark messages `answered'. -\(fn &optional NOERASE TO SUBJECT IN-REPLY-TO CC REPLYBUFFER ACTIONS)" t nil) +\(fn &optional NOERASE TO SUBJECT IN-REPLY-TO CC REPLYBUFFER ACTIONS RETURN-ACTION)" t nil) (autoload 'mail-other-window "sendmail" "\ Like `mail' command, but display mail buffer in another window. @@ -24718,8 +24828,8 @@ ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-force-delete server-start) "server" "server.el" (19687 -;;;;;; 6902)) +;;;;;; server-force-delete server-start) "server" "server.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24782,7 +24892,7 @@ ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (19277 34917)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (19780 4514)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24801,7 +24911,7 @@ ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (19651 33965)) +;;;;;; (19780 4514)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24867,7 +24977,7 @@ ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (19672 56753)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24931,7 +25041,7 @@ ;;;*** -;;;### (autoloads (sha1) "sha1" "sha1.el" (19582 65302)) +;;;### (autoloads (sha1) "sha1" "sha1.el" (19775 2029)) ;;; Generated autoloads from sha1.el (autoload 'sha1 "sha1" "\ @@ -24946,7 +25056,7 @@ ;;;*** ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el" -;;;;;; (19635 50568)) +;;;;;; (19781 20658)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24996,8 +25106,8 @@ ;;;*** ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group -;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (19277 -;;;;;; 34917)) +;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -25036,7 +25146,7 @@ ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (19696 28661)) +;;;;;; (19780 4514)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -25085,8 +25195,8 @@ ;;;*** -;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19696 -;;;;;; 27153)) +;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from gnus/shr.el (autoload 'shr-insert-document "shr" "\ @@ -25097,7 +25207,7 @@ ;;;*** ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage) -;;;;;; "sieve" "gnus/sieve.el" (19628 47406)) +;;;;;; "sieve" "gnus/sieve.el" (19775 2028)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -25118,7 +25228,7 @@ ;;;*** ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -25133,8 +25243,8 @@ ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19668 -;;;;;; 19649)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -25183,7 +25293,7 @@ ;;;*** ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new -;;;;;; define-skeleton) "skeleton" "skeleton.el" (19677 38476)) +;;;;;; define-skeleton) "skeleton" "skeleton.el" (19775 2030)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -25293,7 +25403,7 @@ ;;;*** ;;;### (autoloads (smerge-start-session smerge-mode smerge-ediff) -;;;;;; "smerge-mode" "vc/smerge-mode.el" (19677 38476)) +;;;;;; "smerge-mode" "vc/smerge-mode.el" (19775 2030)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -25318,7 +25428,7 @@ ;;;*** ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -25336,7 +25446,7 @@ ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" -;;;;;; "mail/smtpmail.el" (19277 34921)) +;;;;;; "mail/smtpmail.el" (19775 2029)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -25351,7 +25461,7 @@ ;;;*** -;;;### (autoloads (snake) "snake" "play/snake.el" (19277 34922)) +;;;### (autoloads (snake) "snake" "play/snake.el" (19775 2029)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -25375,7 +25485,7 @@ ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (19277 34921)) +;;;;;; (19775 2029)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -25404,8 +25514,8 @@ ;;;*** -;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19612 -;;;;;; 4032)) +;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -25420,8 +25530,8 @@ ;;;*** -;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (19277 -;;;;;; 34922)) +;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -25498,7 +25608,7 @@ ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields ;;;;;; sort-fields sort-numeric-fields sort-pages sort-paragraphs -;;;;;; sort-lines sort-subr) "sort" "sort.el" (19668 19352)) +;;;;;; sort-lines sort-subr) "sort" "sort.el" (19780 4514)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25642,8 +25752,8 @@ ;;;*** -;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (19648 -;;;;;; 31344)) +;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25659,7 +25769,7 @@ ;;;### (autoloads (spam-report-deagentize spam-report-agentize spam-report-url-to-file ;;;;;; spam-report-url-ping-mm-url spam-report-process-queue) "spam-report" -;;;;;; "gnus/spam-report.el" (19626 25721)) +;;;;;; "gnus/spam-report.el" (19780 4513)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25702,7 +25812,7 @@ ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (19687 6902)) +;;;;;; "speedbar.el" (19780 4514)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25726,53 +25836,8 @@ ;;;*** -;;;### (autoloads (spell-string spell-region spell-word spell-buffer) -;;;;;; "spell" "textmodes/spell.el" (19609 2713)) -;;; Generated autoloads from textmodes/spell.el - -(put 'spell-filter 'risky-local-variable t) - -(autoload 'spell-buffer "spell" "\ -Check spelling of every word in the buffer. -For each incorrect word, you are asked for the correct spelling -and then put into a query-replace to fix some or all occurrences. -If you do not want to change a word, just give the same word -as its \"correct\" spelling; then the query replace is skipped. - -\(fn)" t nil) - -(make-obsolete 'spell-buffer 'ispell-buffer "23.1") - -(autoload 'spell-word "spell" "\ -Check spelling of word at or before point. -If it is not correct, ask user for the correct spelling -and `query-replace' the entire buffer to substitute it. - -\(fn)" t nil) - -(make-obsolete 'spell-word 'ispell-word "23.1") - -(autoload 'spell-region "spell" "\ -Like `spell-buffer' but applies only to region. -Used in a program, applies from START to END. -DESCRIPTION is an optional string naming the unit being checked: -for example, \"word\". - -\(fn START END &optional DESCRIPTION)" t nil) - -(make-obsolete 'spell-region 'ispell-region "23.1") - -(autoload 'spell-string "spell" "\ -Check spelling of string supplied as argument. - -\(fn STRING)" t nil) - -(make-obsolete 'spell-string "The `spell' package is obsolete - use `ispell'." "23.1") - -;;;*** - -;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (19277 -;;;;;; 34922)) +;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (19775 +;;;;;; 2029)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25791,7 +25856,7 @@ ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-connect ;;;;;; sql-mode sql-help sql-add-product-keywords) "sql" "progmodes/sql.el" -;;;;;; (19661 46305)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/sql.el (autoload 'sql-add-product-keywords "sql" "\ @@ -26287,7 +26352,7 @@ ;;;*** ;;;### (autoloads (srecode-template-mode) "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2027)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -26300,7 +26365,7 @@ ;;;*** ;;;### (autoloads (starttls-open-stream) "starttls" "gnus/starttls.el" -;;;;;; (19614 24990)) +;;;;;; (19775 2028)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -26327,8 +26392,8 @@ ;;;;;; strokes-mode strokes-list-strokes strokes-load-user-strokes ;;;;;; strokes-help strokes-describe-stroke strokes-do-complex-stroke ;;;;;; strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke -;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (19277 -;;;;;; 34917)) +;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -26438,7 +26503,7 @@ ;;;*** ;;;### (autoloads (studlify-buffer studlify-word studlify-region) -;;;;;; "studly" "play/studly.el" (19267 61660)) +;;;;;; "studly" "play/studly.el" (19763 27287)) ;;; Generated autoloads from play/studly.el (autoload 'studlify-region "studly" "\ @@ -26459,7 +26524,7 @@ ;;;*** ;;;### (autoloads (global-subword-mode subword-mode) "subword" "progmodes/subword.el" -;;;;;; (19445 54332)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/subword.el (autoload 'subword-mode "subword" "\ @@ -26507,7 +26572,7 @@ ;;;*** ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el" -;;;;;; (19426 22841)) +;;;;;; (19775 2029)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -26539,8 +26604,8 @@ ;;;*** -;;;### (autoloads (gpm-mouse-mode) "t-mouse" "t-mouse.el" (19277 -;;;;;; 34917)) +;;;### (autoloads (gpm-mouse-mode) "t-mouse" "t-mouse.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -26567,7 +26632,7 @@ ;;;*** -;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (19580 19536)) +;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (19775 2030)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -26602,7 +26667,7 @@ ;;;;;; table-recognize table-insert-row-column table-insert-column ;;;;;; table-insert-row table-insert table-point-left-cell-hook ;;;;;; table-point-entered-cell-hook table-load-hook table-cell-map-hook) -;;;;;; "table" "textmodes/table.el" (19668 19553)) +;;;;;; "table" "textmodes/table.el" (19775 2030)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -27190,7 +27255,7 @@ ;;;*** -;;;### (autoloads (talk talk-connect) "talk" "talk.el" (19277 34917)) +;;;### (autoloads (talk talk-connect) "talk" "talk.el" (19775 2030)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -27205,7 +27270,7 @@ ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19617 12132)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19780 4514)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -27229,7 +27294,7 @@ ;;;*** ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" -;;;;;; "progmodes/tcl.el" (19673 45510)) +;;;;;; "progmodes/tcl.el" (19775 2029)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -27260,9 +27325,6 @@ `tcl-mode-hook' to see what kinds of interesting hook functions already exist. -Commands: -\\{tcl-mode-map} - \(fn)" t nil) (autoload 'inferior-tcl "tcl" "\ @@ -27280,7 +27342,7 @@ ;;;*** -;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (19635 50595)) +;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (19780 4514)) ;;; Generated autoloads from net/telnet.el (add-hook 'same-window-regexps (purecopy "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)")) @@ -27308,7 +27370,7 @@ ;;;*** ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el" -;;;;;; (19672 56753)) +;;;;;; (19775 2030)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -27350,8 +27412,8 @@ ;;;*** -;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19277 -;;;;;; 34917)) +;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19780 +;;;;;; 4514)) ;;; Generated autoloads from terminal.el (autoload 'terminal-emulator "terminal" "\ @@ -27388,7 +27450,7 @@ ;;;*** ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el" -;;;;;; (19277 34919)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -27398,7 +27460,7 @@ ;;;*** -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19552 37739)) +;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19775 2029)) ;;; Generated autoloads from play/tetris.el (autoload 'tetris "tetris" "\ @@ -27429,7 +27491,7 @@ ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (19651 33965)) +;;;;;; (19780 4514)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27731,7 +27793,7 @@ ;;;*** ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer) -;;;;;; "texinfmt" "textmodes/texinfmt.el" (19673 38854)) +;;;;;; "texinfmt" "textmodes/texinfmt.el" (19780 4514)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27771,7 +27833,7 @@ ;;;*** ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote) -;;;;;; "texinfo" "textmodes/texinfo.el" (19594 48841)) +;;;;;; "texinfo" "textmodes/texinfo.el" (19775 2030)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27857,7 +27919,7 @@ ;;;### (autoloads (thai-composition-function thai-compose-buffer ;;;;;; thai-compose-string thai-compose-region) "thai-util" "language/thai-util.el" -;;;;;; (19277 34921)) +;;;;;; (19775 2028)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27886,7 +27948,7 @@ ;;;### (autoloads (list-at-point number-at-point symbol-at-point ;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing) -;;;;;; "thingatpt" "thingatpt.el" (19277 34917)) +;;;;;; "thingatpt" "thingatpt.el" (19780 4514)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27943,7 +28005,7 @@ ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked ;;;;;; thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el" -;;;;;; (19277 34917)) +;;;;;; (19775 2030)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27981,8 +28043,8 @@ ;;;;;; tibetan-post-read-conversion tibetan-compose-buffer tibetan-decompose-buffer ;;;;;; tibetan-decompose-string tibetan-decompose-region tibetan-compose-region ;;;;;; tibetan-compose-string tibetan-transcription-to-tibetan tibetan-tibetan-to-transcription -;;;;;; tibetan-char-p) "tibet-util" "language/tibet-util.el" (19277 -;;;;;; 34921)) +;;;;;; tibetan-char-p) "tibet-util" "language/tibet-util.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -28056,7 +28118,7 @@ ;;;*** ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el" -;;;;;; (19277 34923)) +;;;;;; (19775 2030)) ;;; Generated autoloads from textmodes/tildify.el (autoload 'tildify-region "tildify" "\ @@ -28081,7 +28143,7 @@ ;;;### (autoloads (emacs-init-time emacs-uptime display-time-world ;;;;;; display-time-mode display-time display-time-day-and-date) -;;;;;; "time" "time.el" (19623 51891)) +;;;;;; "time" "time.el" (19780 4514)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -28112,7 +28174,9 @@ Toggle display of time, load level, and mail flag in mode lines. With a numeric arg, enable this display if arg is positive. -When this display is enabled, it updates automatically every minute. +When this display is enabled, it updates automatically every minute +\(you can control the number of seconds between updates by +customizing `display-time-interval'). If `display-time-day-and-date' is non-nil, the current day and date are displayed as well. This runs the normal hook `display-time-hook' after each update. @@ -28144,7 +28208,7 @@ ;;;;;; time-to-day-in-year date-leap-year-p days-between date-to-day ;;;;;; time-add time-subtract time-since days-to-time time-less-p ;;;;;; seconds-to-time date-to-time) "time-date" "calendar/time-date.el" -;;;;;; (19672 47874)) +;;;;;; (19775 2027)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -28258,7 +28322,7 @@ ;;;*** ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp" -;;;;;; "time-stamp.el" (19277 34917)) +;;;;;; "time-stamp.el" (19780 4514)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -28302,7 +28366,7 @@ ;;;;;; timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out ;;;;;; timeclock-change timeclock-status-string timeclock-out timeclock-in ;;;;;; timeclock-modeline-display) "timeclock" "calendar/timeclock.el" -;;;;;; (19674 6793)) +;;;;;; (19775 2027)) ;;; Generated autoloads from calendar/timeclock.el (autoload 'timeclock-modeline-display "timeclock" "\ @@ -28402,7 +28466,7 @@ ;;;*** ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv" -;;;;;; "international/titdic-cnv.el" (19639 17158)) +;;;;;; "international/titdic-cnv.el" (19775 2028)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -28425,7 +28489,7 @@ ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" -;;;;;; "tmm.el" (19406 15657)) +;;;;;; "tmm.el" (19775 2030)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -28465,7 +28529,7 @@ ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities ;;;;;; todo-insert-item todo-add-item-non-interactively todo-add-category) -;;;;;; "todo-mode" "calendar/todo-mode.el" (19672 18325)) +;;;;;; "todo-mode" "calendar/todo-mode.el" (19775 2027)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-add-category "todo-mode" "\ @@ -28525,7 +28589,7 @@ ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu ;;;;;; tool-bar-local-item tool-bar-add-item toggle-tool-bar-mode-from-frame) -;;;;;; "tool-bar" "tool-bar.el" (19691 3508)) +;;;;;; "tool-bar" "tool-bar.el" (19775 2030)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -28596,7 +28660,7 @@ ;;;*** ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el" -;;;;;; (19674 8635)) +;;;;;; (19780 4513)) ;;; Generated autoloads from emulation/tpu-edt.el (defvar tpu-edt-mode nil "\ @@ -28623,7 +28687,7 @@ ;;;*** ;;;### (autoloads (tpu-mapper) "tpu-mapper" "emulation/tpu-mapper.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emulation/tpu-mapper.el (autoload 'tpu-mapper "tpu-mapper" "\ @@ -28657,7 +28721,7 @@ ;;;*** -;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (19277 34919)) +;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -28671,7 +28735,7 @@ ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) -;;;;;; "trace" "emacs-lisp/trace.el" (19370 23595)) +;;;;;; "trace" "emacs-lisp/trace.el" (19775 2028)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer (purecopy "*trace-output*") "\ @@ -28708,7 +28772,7 @@ ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" -;;;;;; "net/tramp.el" (19691 3508)) +;;;;;; "net/tramp.el" (19775 2029)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28846,7 +28910,7 @@ ;;;*** ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el" -;;;;;; (19599 45674)) +;;;;;; (19775 2029)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28856,8 +28920,8 @@ ;;;*** -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (19580 -;;;;;; 19536)) +;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28882,7 +28946,7 @@ ;;;*** ;;;### (autoloads (tai-viet-composition-function) "tv-util" "language/tv-util.el" -;;;;;; (19515 27412)) +;;;;;; (19763 27286)) ;;; Generated autoloads from language/tv-util.el (autoload 'tai-viet-composition-function "tv-util" "\ @@ -28893,7 +28957,7 @@ ;;;*** ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column" -;;;;;; "textmodes/two-column.el" (19609 2643)) +;;;;;; "textmodes/two-column.el" (19775 2030)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28944,7 +29008,7 @@ ;;;;;; type-break type-break-mode type-break-keystroke-threshold ;;;;;; type-break-good-break-interval type-break-good-rest-interval ;;;;;; type-break-interval type-break-mode) "type-break" "type-break.el" -;;;;;; (19668 18229)) +;;;;;; (19775 2030)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -29126,7 +29190,7 @@ ;;;*** -;;;### (autoloads (uce-reply-to-uce) "uce" "mail/uce.el" (19277 34921)) +;;;### (autoloads (uce-reply-to-uce) "uce" "mail/uce.el" (19775 2029)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -29144,7 +29208,7 @@ ;;;;;; ucs-normalize-NFKC-string ucs-normalize-NFKC-region ucs-normalize-NFKD-string ;;;;;; ucs-normalize-NFKD-region ucs-normalize-NFC-string ucs-normalize-NFC-region ;;;;;; ucs-normalize-NFD-string ucs-normalize-NFD-region) "ucs-normalize" -;;;;;; "international/ucs-normalize.el" (19600 6790)) +;;;;;; "international/ucs-normalize.el" (19780 4513)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -29210,7 +29274,7 @@ ;;;*** ;;;### (autoloads (ununderline-region underline-region) "underline" -;;;;;; "textmodes/underline.el" (19277 34923)) +;;;;;; "textmodes/underline.el" (19775 2030)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -29231,7 +29295,7 @@ ;;;*** ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el" -;;;;;; (19277 34921)) +;;;;;; (19775 2029)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -29250,8 +29314,8 @@ ;;;*** -;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (19645 -;;;;;; 60484)) +;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (19775 +;;;;;; 2028)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -29264,7 +29328,7 @@ ;;;*** ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url" -;;;;;; "url/url.el" (19622 39471)) +;;;;;; "url/url.el" (19775 2030)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -29306,7 +29370,7 @@ ;;;*** ;;;### (autoloads (url-register-auth-scheme url-get-authentication) -;;;;;; "url-auth" "url/url-auth.el" (19277 34923)) +;;;;;; "url-auth" "url/url-auth.el" (19775 2030)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -29348,7 +29412,7 @@ ;;;*** ;;;### (autoloads (url-cache-extract url-is-cached url-store-in-cache) -;;;;;; "url-cache" "url/url-cache.el" (19624 63510)) +;;;;;; "url-cache" "url/url-cache.el" (19775 2030)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -29369,7 +29433,7 @@ ;;;*** -;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (19277 34923)) +;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (19780 4514)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -29380,7 +29444,7 @@ ;;;*** ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav" -;;;;;; "url/url-dav.el" (19277 34923)) +;;;;;; "url/url-dav.el" (19780 4514)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -29395,8 +29459,8 @@ ;;;*** -;;;### (autoloads (url-file) "url-file" "url/url-file.el" (19687 -;;;;;; 6902)) +;;;### (autoloads (url-file) "url-file" "url/url-file.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -29407,7 +29471,7 @@ ;;;*** ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw" -;;;;;; "url/url-gw.el" (19645 60484)) +;;;;;; "url/url-gw.el" (19780 4514)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -29427,7 +29491,7 @@ ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file ;;;;;; url-file-handler url-handler-mode) "url-handlers" "url/url-handlers.el" -;;;;;; (19277 34923)) +;;;;;; (19775 2030)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -29479,7 +29543,7 @@ ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (19630 1041)) +;;;;;; url-http) "url-http" "url/url-http.el" (19775 2030)) ;;; Generated autoloads from url/url-http.el (autoload 'url-http "url-http" "\ @@ -29545,7 +29609,7 @@ ;;;*** -;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (19594 47996)) +;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (19775 2030)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -29555,8 +29619,8 @@ ;;;*** -;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (19277 -;;;;;; 34923)) +;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -29570,7 +29634,7 @@ ;;;*** ;;;### (autoloads (url-mailto url-mail) "url-mailto" "url/url-mailto.el" -;;;;;; (19277 34923)) +;;;;;; (19775 2030)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -29586,7 +29650,7 @@ ;;;*** ;;;### (autoloads (url-data url-generic-emulator-loader url-info -;;;;;; url-man) "url-misc" "url/url-misc.el" (19277 34923)) +;;;;;; url-man) "url-misc" "url/url-misc.el" (19775 2030)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -29618,7 +29682,7 @@ ;;;*** ;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el" -;;;;;; (19277 34923)) +;;;;;; (19775 2030)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -29635,7 +29699,7 @@ ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable ;;;;;; dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el" -;;;;;; (19277 34923)) +;;;;;; (19775 2030)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -29676,7 +29740,7 @@ ;;;*** ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse" -;;;;;; "url/url-parse.el" (19622 39471)) +;;;;;; "url/url-parse.el" (19775 2030)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -29694,7 +29758,7 @@ ;;;*** ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el" -;;;;;; (19277 34923)) +;;;;;; (19775 2030)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -29710,7 +29774,7 @@ ;;;;;; url-pretty-length url-strip-leading-spaces url-eat-trailing-space ;;;;;; url-get-normalized-date url-lazy-message url-normalize-url ;;;;;; url-insert-entities-in-string url-parse-args url-debug url-debug) -;;;;;; "url-util" "url/url-util.el" (19624 63510)) +;;;;;; "url-util" "url/url-util.el" (19775 2030)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29846,7 +29910,7 @@ ;;;*** ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock) -;;;;;; "userlock" "userlock.el" (19277 34917)) +;;;;;; "userlock" "userlock.el" (19775 2030)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29876,7 +29940,7 @@ ;;;### (autoloads (utf-7-imap-pre-write-conversion utf-7-pre-write-conversion ;;;;;; utf-7-imap-post-read-conversion utf-7-post-read-conversion) -;;;;;; "utf-7" "international/utf-7.el" (19451 17238)) +;;;;;; "utf-7" "international/utf-7.el" (19780 4513)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29901,7 +29965,7 @@ ;;;*** -;;;### (autoloads (utf7-encode) "utf7" "gnus/utf7.el" (19618 38629)) +;;;### (autoloads (utf7-encode) "utf7" "gnus/utf7.el" (19775 2028)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29913,7 +29977,7 @@ ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal ;;;;;; uudecode-decode-region-external) "uudecode" "mail/uudecode.el" -;;;;;; (19582 65302)) +;;;;;; (19775 2029)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29938,12 +30002,12 @@ ;;;*** ;;;### (autoloads (vc-branch-part vc-update-change-log vc-rename-file -;;;;;; vc-delete-file vc-transfer-file vc-switch-backend vc-update +;;;;;; vc-delete-file vc-transfer-file vc-switch-backend vc-pull ;;;;;; vc-rollback vc-revert vc-log-outgoing vc-log-incoming vc-print-root-log ;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers ;;;;;; vc-revision-other-window vc-root-diff vc-diff vc-version-diff ;;;;;; vc-register vc-next-action vc-before-checkin-hook vc-checkin-hook -;;;;;; vc-checkout-hook) "vc" "vc/vc.el" (19693 26133)) +;;;;;; vc-checkout-hook) "vc" "vc/vc.el" (19780 4515)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -30137,7 +30201,7 @@ (define-obsolete-function-alias 'vc-revert-buffer 'vc-revert "23.1") -(autoload 'vc-update "vc" "\ +(autoload 'vc-pull "vc" "\ Update the current fileset or branch. On a distributed version control system, this runs a \"pull\" operation to update the current branch, prompting for an argument @@ -30151,7 +30215,7 @@ \(fn &optional ARG)" t nil) -(defalias 'vc-pull 'vc-update) +(defalias 'vc-update 'vc-pull) (autoload 'vc-switch-backend "vc" "\ Make BACKEND the current version control system for FILE. @@ -30209,7 +30273,7 @@ ;;;*** ;;;### (autoloads (vc-annotate) "vc-annotate" "vc/vc-annotate.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2030)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -30246,7 +30310,7 @@ ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (19662 23188)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (19780 4514)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -30256,7 +30320,7 @@ ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (19693 26133)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (19780 36416)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -30271,7 +30335,7 @@ ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (19662 23188)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (19775 2030)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) (when (file-readable-p (expand-file-name @@ -30281,7 +30345,7 @@ ;;;*** -;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (19580 19536)) +;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (19780 4514)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -30306,7 +30370,7 @@ ;;;*** ;;;### (autoloads (vc-do-command) "vc-dispatcher" "vc/vc-dispatcher.el" -;;;;;; (19580 19536)) +;;;;;; (19780 36416)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -30329,7 +30393,7 @@ ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (19580 19536)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (19780 36416)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -30340,7 +30404,7 @@ ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (19687 6902)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (19780 36416)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -30351,7 +30415,14 @@ ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (19673 45510)) +;;;### (autoloads nil "vc-hooks" "vc/vc-hooks.el" (19780 4514)) +;;; Generated autoloads from vc/vc-hooks.el + +(put 'vc-mode 'risky-local-variable t) + +;;;*** + +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (19775 2030)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN") @@ -30366,7 +30437,7 @@ ;;;*** ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc/vc-rcs.el" -;;;;;; (19662 23188)) +;;;;;; (19780 4515)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -30380,7 +30451,7 @@ ;;;*** ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc/vc-sccs.el" -;;;;;; (19662 23188)) +;;;;;; (19780 4515)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -30397,7 +30468,7 @@ ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (19631 26857)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (19780 4515)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -30413,7 +30484,7 @@ ;;;*** ;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el" -;;;;;; (19668 19680)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/vera-mode.el (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -30471,7 +30542,7 @@ ;;;*** ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (19673 45510)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30608,7 +30679,7 @@ ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (19672 56753)) +;;;;;; (19780 4514)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -31149,7 +31220,7 @@ ;;;*** -;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (19267 61660)) +;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (19763 27286)) ;;; Generated autoloads from emulation/vi.el (autoload 'vi-mode "vi" "\ @@ -31204,7 +31275,7 @@ ;;;### (autoloads (viqr-pre-write-conversion viqr-post-read-conversion ;;;;;; viet-encode-viqr-buffer viet-encode-viqr-region viet-decode-viqr-buffer ;;;;;; viet-decode-viqr-region viet-encode-viscii-char) "viet-util" -;;;;;; "language/viet-util.el" (19277 34921)) +;;;;;; "language/viet-util.el" (19780 4513)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -31252,7 +31323,7 @@ ;;;;;; view-mode view-buffer-other-frame view-buffer-other-window ;;;;;; view-buffer view-file-other-frame view-file-other-window ;;;;;; view-file kill-buffer-if-not-modified view-remove-frame-by-deleting) -;;;;;; "view" "view.el" (19423 37200)) +;;;;;; "view" "view.el" (19780 4515)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -31498,8 +31569,8 @@ ;;;*** -;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (19609 -;;;;;; 2196)) +;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (19780 +;;;;;; 4513)) ;;; Generated autoloads from emulation/vip.el (autoload 'vip-setup "vip" "\ @@ -31515,7 +31586,7 @@ ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (19580 19536)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emulation/viper.el (autoload 'toggle-viper-mode "viper" "\ @@ -31532,7 +31603,7 @@ ;;;*** ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el" -;;;;;; (19607 38013)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -31622,7 +31693,7 @@ ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (19277 34917)) +;;;;;; (19780 4515)) ;;; Generated autoloads from wdired.el (autoload 'wdired-change-to-wdired-mode "wdired" "\ @@ -31638,7 +31709,7 @@ ;;;*** -;;;### (autoloads (webjump) "webjump" "net/webjump.el" (19277 34921)) +;;;### (autoloads (webjump) "webjump" "net/webjump.el" (19775 2029)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -31655,7 +31726,7 @@ ;;;*** ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el" -;;;;;; (19552 37739)) +;;;;;; (19775 2029)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31686,7 +31757,7 @@ ;;;### (autoloads (whitespace-report-region whitespace-report whitespace-cleanup-region ;;;;;; whitespace-cleanup global-whitespace-toggle-options whitespace-toggle-options ;;;;;; global-whitespace-newline-mode global-whitespace-mode whitespace-newline-mode -;;;;;; whitespace-mode) "whitespace" "whitespace.el" (19580 19536)) +;;;;;; whitespace-mode) "whitespace" "whitespace.el" (19780 4515)) ;;; Generated autoloads from whitespace.el (autoload 'whitespace-mode "whitespace" "\ @@ -32089,7 +32160,7 @@ ;;;*** ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse -;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (19580 19536)) +;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (19775 2030)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -32116,8 +32187,8 @@ ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19687 -;;;;;; 6902)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -32160,8 +32231,8 @@ ;;;*** ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right -;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (19277 -;;;;;; 34917)) +;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -32213,8 +32284,15 @@ ;;;*** +;;;### (autoloads nil "window" "window.el" (19775 2030)) +;;; Generated autoloads from window.el + +(put 'special-display-buffer-names 'risky-local-variable t) + +;;;*** + ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el" -;;;;;; (19277 34917)) +;;;;;; (19775 2030)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -32233,7 +32311,7 @@ ;;;*** ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file -;;;;;; woman woman-locale) "woman" "woman.el" (19668 18093)) +;;;;;; woman woman-locale) "woman" "woman.el" (19780 4515)) ;;; Generated autoloads from woman.el (defvar woman-locale nil "\ @@ -32282,7 +32360,7 @@ ;;;*** ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el" -;;;;;; (19634 23255)) +;;;;;; (19775 2028)) ;;; Generated autoloads from emulation/ws-mode.el (autoload 'wordstar-mode "ws-mode" "\ @@ -32394,7 +32472,7 @@ ;;;*** -;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (19360 14173)) +;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (19775 2029)) ;;; Generated autoloads from net/xesam.el (autoload 'xesam-search "xesam" "\ @@ -32414,7 +32492,7 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (19515 27412)) +;;;;;; (19775 2030)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -32440,7 +32518,7 @@ ;;;*** ;;;### (autoloads (xmltok-get-declared-encoding-position) "xmltok" -;;;;;; "nxml/xmltok.el" (19277 34921)) +;;;;;; "nxml/xmltok.el" (19775 2029)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -32458,8 +32536,8 @@ ;;;*** -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19524 -;;;;;; 29717)) +;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19775 +;;;;;; 2030)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -32488,7 +32566,7 @@ ;;;*** ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc" -;;;;;; "gnus/yenc.el" (19582 65302)) +;;;;;; "gnus/yenc.el" (19775 2028)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -32504,7 +32582,7 @@ ;;;*** ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism -;;;;;; yow) "yow" "play/yow.el" (19277 34922)) +;;;;;; yow) "yow" "play/yow.el" (19775 2029)) ;;; Generated autoloads from play/yow.el (autoload 'yow "yow" "\ @@ -32530,7 +32608,7 @@ ;;;*** -;;;### (autoloads (zone) "zone" "play/zone.el" (19515 27412)) +;;;### (autoloads (zone) "zone" "play/zone.el" (19775 2029)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -32540,31 +32618,32 @@ ;;;*** -;;;### (autoloads nil nil ("calc/calc-aent.el" "calc/calc-alg.el" -;;;;;; "calc/calc-arith.el" "calc/calc-bin.el" "calc/calc-comb.el" -;;;;;; "calc/calc-cplx.el" "calc/calc-embed.el" "calc/calc-ext.el" -;;;;;; "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el" -;;;;;; "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el" -;;;;;; "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el" +;;;### (autoloads nil nil ("abbrev.el" "bindings.el" "button.el" +;;;;;; "calc/calc-aent.el" "calc/calc-alg.el" "calc/calc-arith.el" +;;;;;; "calc/calc-bin.el" "calc/calc-comb.el" "calc/calc-cplx.el" +;;;;;; "calc/calc-embed.el" "calc/calc-ext.el" "calc/calc-fin.el" +;;;;;; "calc/calc-forms.el" "calc/calc-frac.el" "calc/calc-funcs.el" +;;;;;; "calc/calc-graph.el" "calc/calc-help.el" "calc/calc-incom.el" +;;;;;; "calc/calc-keypd.el" "calc/calc-lang.el" "calc/calc-loaddefs.el" ;;;;;; "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el" ;;;;;; "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el" ;;;;;; "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el" ;;;;;; "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el" ;;;;;; "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el" -;;;;;; "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-undo.el" -;;;;;; "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el" -;;;;;; "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el" -;;;;;; "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el" -;;;;;; "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el" -;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el" -;;;;;; "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el" -;;;;;; "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el" -;;;;;; "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el" -;;;;;; "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el" -;;;;;; "cedet/cedet-idutils.el" "cedet/cedet.el" "cedet/ede/auto.el" -;;;;;; "cedet/ede/autoconf-edit.el" "cedet/ede/base.el" "cedet/ede/cpp-root.el" -;;;;;; "cedet/ede/custom.el" "cedet/ede/dired.el" "cedet/ede/emacs.el" -;;;;;; "cedet/ede/files.el" "cedet/ede/generic.el" "cedet/ede/linux.el" +;;;;;; "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el" +;;;;;; "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el" +;;;;;; "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el" +;;;;;; "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el" +;;;;;; "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el" +;;;;;; "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el" +;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el" +;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el" +;;;;;; "calendar/hol-loaddefs.el" "case-table.el" "cdl.el" "cedet/cedet-cscope.el" +;;;;;; "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el" +;;;;;; "cedet/cedet.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" +;;;;;; "cedet/ede/base.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el" +;;;;;; "cedet/ede/dired.el" "cedet/ede/emacs.el" "cedet/ede/files.el" +;;;;;; "cedet/ede/generic.el" "cedet/ede/linux.el" "cedet/ede/loaddefs.el" ;;;;;; "cedet/ede/locate.el" "cedet/ede/make.el" "cedet/ede/makefile-edit.el" ;;;;;; "cedet/ede/pconf.el" "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" ;;;;;; "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" @@ -32594,13 +32673,13 @@ ;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el" ;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el" ;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" -;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" -;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" -;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" -;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" -;;;;;; "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el" -;;;;;; "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el" -;;;;;; "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" +;;;;;; "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el" +;;;;;; "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el" +;;;;;; "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el" +;;;;;; "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el" +;;;;;; "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el" +;;;;;; "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" @@ -32612,44 +32691,50 @@ ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" -;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" -;;;;;; "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" -;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" -;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el" -;;;;;; "dos-w32.el" "dynamic-setting.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el" -;;;;;; "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" +;;;;;; "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el" +;;;;;; "cedet/srecode/semantic.el" "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" +;;;;;; "cedet/srecode/table.el" "cedet/srecode/template.el" "cedet/srecode/texi.el" +;;;;;; "color.el" "cus-dep.el" "cus-face.el" "cus-load.el" "cus-start.el" +;;;;;; "custom.el" "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" +;;;;;; "dos-vars.el" "dos-w32.el" "dynamic-setting.el" "emacs-lisp/assoc.el" +;;;;;; "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/backquote.el" +;;;;;; "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/byte-run.el" ;;;;;; "emacs-lisp/chart.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el" ;;;;;; "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el" ;;;;;; "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-comp.el" ;;;;;; "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el" ;;;;;; "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el" -;;;;;; "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el" -;;;;;; "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" "emacs-lisp/regi.el" -;;;;;; "emacs-lisp/smie.el" "emacs-lisp/sregex.el" "emacs-lisp/tcover-ses.el" -;;;;;; "emacs-lisp/tcover-unsafep.el" "emacs-lock.el" "emulation/cua-gmrk.el" +;;;;;; "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" "emacs-lisp/float-sup.el" +;;;;;; "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/lisp-mode.el" +;;;;;; "emacs-lisp/lisp.el" "emacs-lisp/map-ynp.el" "emacs-lisp/package-x.el" +;;;;;; "emacs-lisp/regi.el" "emacs-lisp/smie.el" "emacs-lisp/syntax.el" +;;;;;; "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el" +;;;;;; "emacs-lisp/timer.el" "emacs-lock.el" "emulation/cua-gmrk.el" ;;;;;; "emulation/cua-rect.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el" ;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/tpu-extras.el" ;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el" ;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el" -;;;;;; "emulation/viper-util.el" "erc/erc-backend.el" "erc/erc-goodies.el" -;;;;;; "erc/erc-ibuffer.el" "erc/erc-lang.el" "eshell/em-alias.el" -;;;;;; "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el" -;;;;;; "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el" -;;;;;; "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el" -;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" -;;;;;; "eshell/em-term.el" "eshell/em-unix.el" "eshell/em-xtra.el" -;;;;;; "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el" -;;;;;; "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el" -;;;;;; "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el" -;;;;;; "ezimage.el" "foldout.el" "format-spec.el" "forms-d2.el" -;;;;;; "forms-pass.el" "fringe.el" "generic-x.el" "gnus/auth-source.el" -;;;;;; "gnus/color.el" "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" -;;;;;; "gnus/gnus-cite.el" "gnus/gnus-cus.el" "gnus/gnus-demon.el" -;;;;;; "gnus/gnus-dup.el" "gnus/gnus-eform.el" "gnus/gnus-ems.el" -;;;;;; "gnus/gnus-int.el" "gnus/gnus-logic.el" "gnus/gnus-mh.el" -;;;;;; "gnus/gnus-salt.el" "gnus/gnus-score.el" "gnus/gnus-setup.el" -;;;;;; "gnus/gnus-srvr.el" "gnus/gnus-topic.el" "gnus/gnus-undo.el" -;;;;;; "gnus/gnus-util.el" "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/ietf-drums.el" +;;;;;; "emulation/viper-util.el" "env.el" "epa-hook.el" "erc/erc-backend.el" +;;;;;; "erc/erc-goodies.el" "erc/erc-ibuffer.el" "erc/erc-lang.el" +;;;;;; "eshell/em-alias.el" "eshell/em-banner.el" "eshell/em-basic.el" +;;;;;; "eshell/em-cmpl.el" "eshell/em-dirs.el" "eshell/em-glob.el" +;;;;;; "eshell/em-hist.el" "eshell/em-ls.el" "eshell/em-pred.el" +;;;;;; "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el" +;;;;;; "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-unix.el" +;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" +;;;;;; "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el" +;;;;;; "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el" +;;;;;; "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "facemenu.el" +;;;;;; "faces.el" "files.el" "finder-inf.el" "foldout.el" "font-lock.el" +;;;;;; "format-spec.el" "forms-d2.el" "forms-pass.el" "frame.el" +;;;;;; "fringe.el" "generic-x.el" "gnus/auth-source.el" "gnus/compface.el" +;;;;;; "gnus/gnus-async.el" "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" +;;;;;; "gnus/gnus-cus.el" "gnus/gnus-demon.el" "gnus/gnus-dup.el" +;;;;;; "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-int.el" +;;;;;; "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el" +;;;;;; "gnus/gnus-score.el" "gnus/gnus-setup.el" "gnus/gnus-srvr.el" +;;;;;; "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el" +;;;;;; "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/ietf-drums.el" ;;;;;; "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" "gnus/mail-prsvr.el" ;;;;;; "gnus/mail-source.el" "gnus/mailcap.el" "gnus/messcompat.el" ;;;;;; "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-encode.el" @@ -32661,32 +32746,43 @@ ;;;;;; "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnregistry.el" "gnus/nnrss.el" ;;;;;; "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnvirtual.el" "gnus/nnweb.el" ;;;;;; "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el" "gnus/rfc2104.el" -;;;;;; "gnus/rfc2231.el" "gnus/shr-color.el" "gnus/sieve-manage.el" -;;;;;; "gnus/smime.el" "gnus/spam-stat.el" "gnus/spam-wash.el" "hex-util.el" -;;;;;; "hfy-cmap.el" "ibuf-ext.el" "international/charprop.el" "international/cp51932.el" -;;;;;; "international/eucjp-ms.el" "international/fontset.el" "international/iso-ascii.el" -;;;;;; "international/ja-dic-cnv.el" "international/ja-dic-utl.el" -;;;;;; "international/ogonek.el" "international/uni-bidi.el" "international/uni-category.el" -;;;;;; "international/uni-combining.el" "international/uni-comment.el" -;;;;;; "international/uni-decimal.el" "international/uni-decomposition.el" -;;;;;; "international/uni-digit.el" "international/uni-lowercase.el" -;;;;;; "international/uni-mirrored.el" "international/uni-name.el" -;;;;;; "international/uni-numeric.el" "international/uni-old-name.el" -;;;;;; "international/uni-titlecase.el" "international/uni-uppercase.el" -;;;;;; "json.el" "kermit.el" "language/hanja-util.el" "language/thai-word.el" -;;;;;; "ldefs-boot.el" "mail/blessmail.el" "mail/mailheader.el" -;;;;;; "mail/mailpost.el" "mail/mspools.el" "mail/rfc2368.el" "mail/rfc822.el" -;;;;;; "mail/rmail-spam-filter.el" "mail/rmailedit.el" "mail/rmailkwd.el" -;;;;;; "mail/rmailmm.el" "mail/rmailmsc.el" "mail/rmailsort.el" -;;;;;; "mail/rmailsum.el" "mail/undigest.el" "md4.el" "mh-e/mh-acros.el" -;;;;;; "mh-e/mh-alias.el" "mh-e/mh-buffers.el" "mh-e/mh-compat.el" -;;;;;; "mh-e/mh-funcs.el" "mh-e/mh-gnus.el" "mh-e/mh-identity.el" -;;;;;; "mh-e/mh-inc.el" "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el" +;;;;;; "gnus/rfc2231.el" "gnus/rtree.el" "gnus/shr-color.el" "gnus/sieve-manage.el" +;;;;;; "gnus/smime.el" "gnus/spam-stat.el" "gnus/spam-wash.el" "help.el" +;;;;;; "hex-util.el" "hfy-cmap.el" "ibuf-ext.el" "indent.el" "international/characters.el" +;;;;;; "international/charprop.el" "international/cp51932.el" "international/eucjp-ms.el" +;;;;;; "international/fontset.el" "international/iso-ascii.el" "international/ja-dic-cnv.el" +;;;;;; "international/ja-dic-utl.el" "international/mule-conf.el" +;;;;;; "international/mule.el" "international/ogonek.el" "international/uni-bidi.el" +;;;;;; "international/uni-category.el" "international/uni-combining.el" +;;;;;; "international/uni-comment.el" "international/uni-decimal.el" +;;;;;; "international/uni-decomposition.el" "international/uni-digit.el" +;;;;;; "international/uni-lowercase.el" "international/uni-mirrored.el" +;;;;;; "international/uni-name.el" "international/uni-numeric.el" +;;;;;; "international/uni-old-name.el" "international/uni-titlecase.el" +;;;;;; "international/uni-uppercase.el" "isearch.el" "jit-lock.el" +;;;;;; "jka-cmpr-hook.el" "json.el" "kermit.el" "language/burmese.el" +;;;;;; "language/cham.el" "language/chinese.el" "language/cyrillic.el" +;;;;;; "language/czech.el" "language/english.el" "language/ethiopic.el" +;;;;;; "language/european.el" "language/georgian.el" "language/greek.el" +;;;;;; "language/hanja-util.el" "language/hebrew.el" "language/indian.el" +;;;;;; "language/japanese.el" "language/khmer.el" "language/korean.el" +;;;;;; "language/lao.el" "language/misc-lang.el" "language/romanian.el" +;;;;;; "language/sinhala.el" "language/slovak.el" "language/tai-viet.el" +;;;;;; "language/thai-word.el" "language/thai.el" "language/tibetan.el" +;;;;;; "language/utf-8-lang.el" "language/vietnamese.el" "ldefs-boot.el" +;;;;;; "loadup.el" "mail/blessmail.el" "mail/mailheader.el" "mail/mailpost.el" +;;;;;; "mail/mspools.el" "mail/rfc2368.el" "mail/rfc822.el" "mail/rmail-spam-filter.el" +;;;;;; "mail/rmailedit.el" "mail/rmailkwd.el" "mail/rmailmm.el" +;;;;;; "mail/rmailmsc.el" "mail/rmailsort.el" "mail/rmailsum.el" +;;;;;; "mail/undigest.el" "md4.el" "mh-e/mh-acros.el" "mh-e/mh-alias.el" +;;;;;; "mh-e/mh-buffers.el" "mh-e/mh-compat.el" "mh-e/mh-funcs.el" +;;;;;; "mh-e/mh-gnus.el" "mh-e/mh-identity.el" "mh-e/mh-inc.el" +;;;;;; "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el" ;;;;;; "mh-e/mh-loaddefs.el" "mh-e/mh-mime.el" "mh-e/mh-print.el" ;;;;;; "mh-e/mh-scan.el" "mh-e/mh-search.el" "mh-e/mh-seq.el" "mh-e/mh-show.el" ;;;;;; "mh-e/mh-speed.el" "mh-e/mh-thread.el" "mh-e/mh-tool-bar.el" -;;;;;; "mh-e/mh-utils.el" "mh-e/mh-xface.el" "mouse-copy.el" "mouse.el" -;;;;;; "mwheel.el" "net/dns.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" +;;;;;; "mh-e/mh-utils.el" "mh-e/mh-xface.el" "minibuffer.el" "mouse-copy.el" +;;;;;; "mouse.el" "mwheel.el" "net/dns.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" ;;;;;; "net/eudcb-ldap.el" "net/eudcb-mab.el" "net/eudcb-ph.el" ;;;;;; "net/gnutls.el" "net/hmac-def.el" "net/hmac-md5.el" "net/imap-hash.el" ;;;;;; "net/imap.el" "net/ldap.el" "net/mairix.el" "net/newsticker.el" @@ -32710,41 +32806,45 @@ ;;;;;; "org/ob-ref.el" "org/ob-ruby.el" "org/ob-sass.el" "org/ob-scheme.el" ;;;;;; "org/ob-screen.el" "org/ob-sh.el" "org/ob-sql.el" "org/ob-sqlite.el" ;;;;;; "org/ob-table.el" "org/org-beamer.el" "org/org-bibtex.el" -;;;;;; "org/org-colview.el" "org/org-compat.el" "org/org-crypt.el" -;;;;;; "org/org-ctags.el" "org/org-docview.el" "org/org-entities.el" -;;;;;; "org/org-exp-blocks.el" "org/org-faces.el" "org/org-gnus.el" -;;;;;; "org/org-habit.el" "org/org-info.el" "org/org-inlinetask.el" +;;;;;; "org/org-colview.el" "org/org-compat.el" "org/org-complete.el" +;;;;;; "org/org-crypt.el" "org/org-ctags.el" "org/org-docview.el" +;;;;;; "org/org-entities.el" "org/org-exp-blocks.el" "org/org-faces.el" +;;;;;; "org/org-gnus.el" "org/org-habit.el" "org/org-info.el" "org/org-inlinetask.el" ;;;;;; "org/org-install.el" "org/org-jsinfo.el" "org/org-list.el" ;;;;;; "org/org-mac-message.el" "org/org-macs.el" "org/org-mew.el" ;;;;;; "org/org-mhe.el" "org/org-mks.el" "org/org-mouse.el" "org/org-protocol.el" ;;;;;; "org/org-rmail.el" "org/org-src.el" "org/org-vm.el" "org/org-w3m.el" -;;;;;; "org/org-wl.el" "patcomp.el" "pgg-def.el" "pgg-parse.el" -;;;;;; "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el" "play/gametree.el" -;;;;;; "play/meese.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" -;;;;;; "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el" -;;;;;; "progmodes/cc-defs.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el" -;;;;;; "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" -;;;;;; "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el" -;;;;;; "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el" -;;;;;; "progmodes/idlw-help.el" "progmodes/idlw-toolbar.el" "progmodes/mantemp.el" -;;;;;; "progmodes/xscheme.el" "ps-def.el" "ps-mule.el" "ps-samp.el" -;;;;;; "saveplace.el" "sb-image.el" "scroll-bar.el" "select.el" -;;;;;; "soundex.el" "subdirs.el" "tempo.el" "textmodes/bib-mode.el" -;;;;;; "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/refbib.el" -;;;;;; "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" -;;;;;; "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" -;;;;;; "textmodes/texnfo-upd.el" "timezone.el" "tooltip.el" "tree-widget.el" +;;;;;; "org/org-wl.el" "patcomp.el" "paths.el" "play/gamegrid.el" +;;;;;; "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el" +;;;;;; "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" +;;;;;; "progmodes/cc-cmds.el" "progmodes/cc-defs.el" "progmodes/cc-fonts.el" +;;;;;; "progmodes/cc-langs.el" "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" +;;;;;; "progmodes/ebnf-bnf.el" "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" +;;;;;; "progmodes/ebnf-iso.el" "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el" +;;;;;; "progmodes/idlw-complete-structtag.el" "progmodes/idlw-help.el" +;;;;;; "progmodes/idlw-toolbar.el" "progmodes/mantemp.el" "progmodes/xscheme.el" +;;;;;; "ps-def.el" "ps-mule.el" "ps-samp.el" "register.el" "replace.el" +;;;;;; "rfn-eshadow.el" "saveplace.el" "sb-image.el" "scroll-bar.el" +;;;;;; "select.el" "simple.el" "soundex.el" "startup.el" "subdirs.el" +;;;;;; "subr.el" "tempo.el" "textmodes/bib-mode.el" "textmodes/fill.el" +;;;;;; "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/page.el" +;;;;;; "textmodes/paragraphs.el" "textmodes/refbib.el" "textmodes/refer.el" +;;;;;; "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" "textmodes/reftex-ref.el" +;;;;;; "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" "textmodes/texnfo-upd.el" +;;;;;; "textmodes/text-mode.el" "timezone.el" "tooltip.el" "tree-widget.el" ;;;;;; "uniquify.el" "url/url-about.el" "url/url-cookie.el" "url/url-dired.el" ;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" ;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" ;;;;;; "url/url-vars.el" "vc/ediff-diff.el" "vc/ediff-init.el" "vc/ediff-merg.el" ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" -;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-fns.el" -;;;;;; "w32-vars.el" "x-dnd.el") (19696 28874 906463)) +;;;;;; "vcursor.el" "version.el" "vt-control.el" "vt100-led.el" +;;;;;; "w32-fns.el" "w32-vars.el" "widget.el" "x-dnd.el") (19781 +;;;;;; 20793 754803)) ;;;*** +(provide 'loaddefs) ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ------------------------------------------------------------ revno: 103031 committer: Jim Meyering branch nick: trunk timestamp: Sun 2011-01-30 10:17:36 +0100 message: make-docfile: don't corrupt heap for an invalid .elc file diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-01-29 12:36:11 +0000 +++ lib-src/ChangeLog 2011-01-30 09:17:36 +0000 @@ -1,3 +1,11 @@ +2011-01-30 Jim Meyering + + make-docfile: don't corrupt heap for an invalid .elc file + "printf '#@1a' > in.elc; ./make-docfile in.elc" would store 0 + one byte before just-malloc'd saved_string buffer. + * make-docfile.c (scan_lisp_file): Diagnose an invalid dynamic + doc string length. Also fix an always-false while-loop test. + 2011-01-29 Eli Zaretskii * makefile.w32-in (LOCAL_FLAGS): Add -I../lib. === modified file 'lib-src/make-docfile.c' --- lib-src/make-docfile.c 2011-01-25 04:08:28 +0000 +++ lib-src/make-docfile.c 2011-01-30 09:17:36 +0000 @@ -873,8 +873,8 @@ c = getc (infile); if (c == '@') { - int length = 0; - int i; + size_t length = 0; + size_t i; /* Read the length. */ while ((c = getc (infile), @@ -884,6 +884,12 @@ length += c - '0'; } + if (length <= 1) + fatal ("invalid dynamic doc string length", ""); + + if (c != ' ') + fatal ("space not found after dynamic doc string length", ""); + /* The next character is a space that is counted in the length but not part of the doc string. We already read it, so just ignore it. */ @@ -899,7 +905,7 @@ but it is redundant in DOC. So get rid of it here. */ saved_string[length - 1] = 0; /* Skip the line break. */ - while (c == '\n' && c == '\r') + while (c == '\n' || c == '\r') c = getc (infile); /* Skip the following line. */ while (c != '\n' && c != '\r') ------------------------------------------------------------ revno: 103030 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2011-01-30 03:00:34 +0000 message: nnmail.el (nnmail-article-group): A better test for fanciness. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-30 02:51:45 +0000 +++ lisp/gnus/ChangeLog 2011-01-30 03:00:34 +0000 @@ -2,6 +2,7 @@ * nnmail.el (nnmail-article-group): Check for a direct fancy split method. + (nnmail-article-group): A better test for fanciness. * nnimap.el (nnimap-request-head): Protect against not finding the article by Message-ID. === modified file 'lisp/gnus/nnmail.el' --- lisp/gnus/nnmail.el 2011-01-30 02:51:45 +0000 +++ lisp/gnus/nnmail.el 2011-01-30 03:00:34 +0000 @@ -1148,8 +1148,7 @@ (setq nnmail-split-trace nil)) (if (or (and (symbolp nnmail-split-methods) (fboundp nnmail-split-methods)) - (memq (car-safe nnmail-split-methods) - '(| &)) + (not (consp (car-safe nnmail-split-methods))) (and (listp nnmail-split-methods) ;; Not a regular split method, so it has to be a ;; fancy one. ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.