(or (nth 4 spec) 3)
(intern (format "gnus-emphasis-%s" (nth 2 spec)))))
types))
- '(("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)"
+ '(;; I've never seen anyone use this strikethru convention whereas I've
+ ;; several times seen it triggered by normal text. --Stef
+ ;; Miles suggests that this form is sometimes used but for italics,
+ ;; so maybe we should map it to `italic'.
+ ;; ("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)"
+ ;; 2 3 gnus-emphasis-strikethru)
+ ("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)"
2 3 gnus-emphasis-underline))))
"*Alist that says how to fontify certain phrases.
Each item looks like this:
:link '(custom-manual "(gnus)Article Date")
:group 'gnus-article-washing)
-(eval-and-compile
- (autoload 'mail-extract-address-components "mail-extr"))
-
(defcustom gnus-save-all-headers t
"*If non-nil, don't remove any headers before saving."
:group 'gnus-article-saving
;; The command is a string, so we interpret the command
;; as a, well, command, and fork it off.
(let ((process-connection-type nil))
- (process-kill-without-query
+ (gnus-set-process-query-on-exit-flag
(start-process
"article-x-face" nil shell-file-name
- shell-command-switch gnus-article-x-face-command))
+ shell-command-switch gnus-article-x-face-command)
+ nil)
(with-temp-buffer
(insert face)
(process-send-region "article-x-face"
should replace the \"Date:\" one, or should be added below it."
(interactive (list 'ut t))
(let* ((tdate-regexp "^Date:[ \t]\\|^X-Sent:[ \t]")
- (date-regexp (if (and gnus-article-date-lapsed-new-header
- (eq type 'lapsed))
- "^X-Sent:[ \t]"
- tdate-regexp))
+ (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)
(inhibit-read-only t)
(inhibit-point-motion-hooks t)
(save-restriction
(widen)
(goto-char (point-min))
- (while (and (or (setq date (get-text-property (setq pos (point))
- 'original-date))
- (and (setq pos (next-single-property-change
- (point) 'original-date))
- (setq date (get-text-property pos
- 'original-date))))
- (not (string-equal date "")))
- (goto-char (or (text-property-any pos (point-max)
- 'original-date nil)
- (point-max)))
- ;; Skip Face or X-Face.
- (unless (bolp)
- (end-of-line)
- (goto-char (or (text-property-any pos (point-max)
- 'original-date nil)
- (point-max))))
- (narrow-to-region pos (point))
+ (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 (or (text-property-any pos (point-max)
+ 'original-date nil)
+ (point-max)))
(goto-char (point-min))
(when (re-search-forward tdate-regexp nil t)
(setq bface (get-text-property (point-at-bol) 'face)
(defun article-update-date-lapsed ()
"Function to be run from a timer to update the lapsed time line."
- (let (deactivate-mark)
- (save-excursion
- (ignore-errors
- (walk-windows
- (lambda (w)
- (set-buffer (window-buffer w))
- (when (eq major-mode 'gnus-article-mode)
- (let ((mark (point-marker)))
- (goto-char (point-min))
- (when (re-search-forward "^X-Sent:" nil t)
- (article-date-lapsed t))
- (goto-char (marker-position mark))
- (move-marker mark nil))))
- nil 'visible)))))
+ (save-match-data
+ (let (deactivate-mark)
+ (save-excursion
+ (ignore-errors
+ (walk-windows
+ (lambda (w)
+ (set-buffer (window-buffer w))
+ (when (or (and (eq major-mode 'mime-view-mode)
+ (eq (mime-preview-original-major-mode)
+ 'gnus-original-article-mode))
+ (eq major-mode 'gnus-article-mode))
+ (let ((mark (point-marker)))
+ (goto-char (point-min))
+ (when (re-search-forward "^X-Sent:" nil t)
+ (article-date-lapsed t))
+ (goto-char (marker-position mark))
+ (move-marker mark nil))))
+ nil 'visible))))))
(defun gnus-start-date-timer (&optional n)
"Start a timer to update the X-Sent header in the article buffers.
(interactive (list t))
(article-date-ut 'iso8601 highlight))
-(defun gnus-article-save-original-date ()
- "Save the original date as a text property."
- ;;(goto-char (point-max))
- (skip-chars-backward "\n")
- (let (start
- (end (point))
- (case-fold-search t))
- (goto-char (point-min))
- (when (and (re-search-forward "^date:[\t\n ]+" nil t)
- (progn
- (setq start (match-end 0))
- (re-search-forward "[\t ]*\n\\(?:[^\t ]\\|\\'\\)" nil t)))
- (put-text-property
- (point-min) end 'original-date
- (buffer-substring-no-properties start (match-beginning 0))))))
+(defmacro gnus-article-save-original-date (&rest forms)
+ "Save the original date as a text property and evaluate FORMS."
+ `(let* ((case-fold-search t)
+ (start (progn
+ (goto-char (point-min))
+ (when (and (re-search-forward "^date:[\t\n ]+" nil t)
+ (not (bolp)))
+ (match-end 0))))
+ (date (when (and start
+ (re-search-forward "[\t ]*\n\\(?:[^\t ]\\|\\'\\)"
+ nil t))
+ (buffer-substring-no-properties start
+ (match-beginning 0)))))
+ (goto-char (point-max))
+ (skip-chars-backward "\n")
+ (put-text-property (point-min) (point) 'original-date date)
+ ,@forms
+ (goto-char (point-max))
+ (skip-chars-backward "\n")
+ (put-text-property (point-min) (point) 'original-date date)))
;; (defun article-show-all ()
;; "Show all hidden text in the article buffer."
(setq buffer-read-only t
show-trailing-whitespace nil)
(set-syntax-table gnus-article-mode-syntax-table)
- (gnus-run-hooks 'gnus-article-mode-hook))
+ (gnus-run-mode-hooks 'gnus-article-mode-hook))
(defun gnus-article-setup-buffer ()
"Initialize the article buffer."
(if (search-forward "\n\n" nil t)
(point)
(point-max)))
- (gnus-article-save-original-date)
- (gnus-treat-article 'head)
+ (gnus-article-save-original-date (gnus-treat-article 'head))
(put-text-property (point-min) (point-max) 'article-treated-header t)
(goto-char (point-max)))
(while (and (not (eobp)) entity)
(if (search-forward "\n\n" nil t)
(point)
(point-max)))
- (gnus-article-save-original-date)
- (gnus-treat-article 'head)
+ (gnus-article-save-original-date (gnus-treat-article 'head))
(put-text-property (point-min) (point-max) 'article-treated-header t)
(goto-char (point-max))
(widen)
and `gnus-mime-delete-part', and not provided at run-time normally."
(gnus-article-edit-article
`(lambda ()
+ (buffer-disable-undo)
(erase-buffer)
(let ((mail-parse-charset (or gnus-article-charset
',gnus-newsgroup-charset))
(set-window-point window point)))
(let ((handles ihandles)
(inhibit-read-only t)
- handle name type b e display)
+ handle)
(cond (handles)
((setq handles (mm-dissect-buffer nil gnus-article-loose-mime))
(when gnus-article-emulate-mime
(save-restriction
(article-goto-body)
(narrow-to-region (point-min) (point))
- (gnus-article-save-original-date)
- (gnus-treat-article 'head))))))))
+ (gnus-article-save-original-date
+ (gnus-treat-article 'head)))))))))
(defcustom gnus-mime-display-multipart-as-mixed nil
"Display \"multipart\" parts as \"multipart/mixed\".
(match-string 3 address)
"nntp")))
nil nil nil
- (and (match-end 6) (list (string-to-int (match-string 6 address))))))))
+ (and (match-end 6) (list (string-to-number (match-string 6 address))))))))
(defun gnus-url-parse-query-string (query &optional downcase)
(let (retval pairs cur key val)
projects / elisp / gnus.git- / blobdiff