comparison lisp/gnus/shr.el @ 110968:3958dbde1223

Merge changes made in Gnus trunk. auth.texi (GnuPG and EasyPG Assistant Configuration): Fix syntax and trim sentence. shr.el (shr-current-column): Remove buggy and unnecessary function. auth.texi: Fix up pxref/xref. auth.texi (GnuPG and EasyPG Assistant Configuration): Fix up the @item syntax for in-Emacs makeinfo. gnus-spec.el (gnus-parse-simple-format): princ doesn't really insert anything in Emacs. mm-decode.el (mm-shr): Allow use from non-Gnus users. nnimap.el (nnimap-parse-flags): Be more strict when looking for FETCH responses. nnimap.el, tls.el: Rip the STARTTLS stuff out of tls.el again, and just bind it directly from nnimap. shr.el (shr-find-fill-point): Use a filling algorithm that should probably work for CJVK text, too. nnimap.el (nnimap-open-connection): Fix open-tls-stream call. nnimap.el (nnimap-parse-flags): Fix regexp. tls.el (tls-program): Remove spurious %s from openssl. shr.el (shr-find-fill-point): Don't inloop on indented text.

110967:188673195616

	;; upwards the first point in the buffer where the text really
	;; starts.
	(unless shr-start
	  (setq shr-start (point)))
	(insert elem)
	(when (> (shr-current-column) shr-width)
	  (if (not (search-backward " " (line-beginning-position) t))
	      (insert "\n")
	    (delete-char 1)
	    (insert "\n")
	    (put-text-property (1- (point)) (point) 'shr-break t)
	    (when (> shr-indentation 0)

	(delete-char -1))))))

(defun shr-find-fill-point ()
  (let ((found nil))
    (while (and (not found)
		(not (bolp)))
      (when (or (eq (preceding-char) ? )
		(aref fill-find-break-point-function-table (preceding-char)))
	(setq found (point)))
      (backward-char 1))
    (or found
	(end-of-line))))

(defun shr-current-column ()
  (let ((column 0))
    (save-excursion
      (beginning-of-line)
      (while (not (eolp))
	(incf column (char-width (following-char)))
	(forward-char 1)))
    column))

(defun shr-ensure-newline ()
  (unless (zerop (current-column))
    (insert "\n")))

110968:3958dbde1223

	;; upwards the first point in the buffer where the text really
	;; starts.
	(unless shr-start
	  (setq shr-start (point)))
	(insert elem)
	(while (> (current-column) shr-width)
	  (if (not (shr-find-fill-point))
	      (insert "\n")
	    (delete-char 1)
	    (insert "\n")
	    (put-text-property (1- (point)) (point) 'shr-break t)
	    (when (> shr-indentation 0)

	(delete-char -1))))))

(defun shr-find-fill-point ()
  (let ((found nil))
    (while (and (not found)
		(> (current-column) shr-indentation))
      (when (and (or (eq (preceding-char) ? )
		     (aref fill-find-break-point-function-table
			   (preceding-char)))
		 (<= (current-column) shr-width))
	(setq found (point)))
      (backward-char 1))
    (or found
	(end-of-line))))

(defun shr-ensure-newline ()
  (unless (zerop (current-column))
    (insert "\n")))