X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-spec.el;h=5cf3fda2764401113d8aaf257baba36c8312da05;hb=0a4638ac9f2eb076e478cf5f99ff8afc308cdbbd;hp=f1ea6d79f4a4208377dec8f10d5fcd6e0d62b312;hpb=a3e52de2271f1336cb7e3c31c14bd122f4db609e;p=gnus

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index f1ea6d79f..5cf3fda27 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -1,7 +1,7 @@
 ;;; gnus-spec.el --- format spec functions for Gnus
-;; Copyright (C) 1996,97 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 
 ;;; Internal variables.
@@ -180,9 +182,8 @@
 	      val)
 	  (when (and (boundp buffer)
 		     (setq val (symbol-value buffer))
-		     (get-buffer val)
-		     (buffer-name (get-buffer val)))
-	    (set-buffer (get-buffer val)))
+		     (gnus-buffer-exists-p val))
+	    (set-buffer val))
 	  (setq new-format (symbol-value
 			    (intern (format "gnus-%s-line-format" type)))))
 	(setq entry (cdr (assq type gnus-format-specs)))
@@ -200,9 +201,7 @@
 		  (gnus-parse-format
 		   new-format
 		   (symbol-value
-		    (intern (format "gnus-%s-line-format-alist"
-				    (if (eq type 'article-mode)
-					'summary-mode type))))
+		    (intern (format "gnus-%s-line-format-alist" type)))
 		   (not (string-match "mode$" (symbol-name type))))))
 	  ;; Enter the new format spec into the list.
 	  (if entry
@@ -236,9 +235,15 @@
 (defvar gnus-face-4 'bold)
 
 (defun gnus-face-face-function (form type)
+  `(gnus-add-text-properties
+    (point) (progn ,@form (point))
+    '(gnus-face t face ,(symbol-value (intern (format "gnus-face-%d" type))))))
+
+(defun gnus-balloon-face-function (form type)
   `(gnus-put-text-property
     (point) (progn ,@form (point))
-    'face ',(symbol-value (intern (format "gnus-face-%d" type)))))
+    'balloon-help
+    ,(intern (format "gnus-balloon-face-%d" type))))
 
 (defun gnus-tilde-max-form (el max-width)
   "Return a form that limits EL to MAX-WIDTH."
@@ -286,8 +291,10 @@
   ;; SPEC-ALIST and returns a list that can be eval'ed to return the
   ;; string.  If the FORMAT string contains the specifiers %( and %)
   ;; the text between them will have the mouse-face text property.
+  ;; If the FORMAT string contains the specifiers %[ and %], the text between
+  ;; them will have the balloon-help text property.
   (if (string-match
-       "\\`\\(.*\\)%[0-9]?[{(]\\(.*\\)%[0-9]?[})]\\(.*\n?\\)\\'"
+       "\\`\\(.*\\)%[0-9]?[{(«]\\(.*\\)%[0-9]?[»})]\\(.*\n?\\)\\'"
        format)
       (gnus-parse-complex-format format spec-alist)
     ;; This is a simple format.
@@ -302,12 +309,17 @@
       (replace-match "\\\"" nil t))
     (goto-char (point-min))
     (insert "(\"")
-    (while (re-search-forward "%\\([0-9]+\\)?\\([{}()]\\)" nil t)
+    (while (re-search-forward "%\\([0-9]+\\)?\\([«»{}()]\\)" nil t)
       (let ((number (if (match-beginning 1)
 			(match-string 1) "0"))
 	    (delim (aref (match-string 2) 0)))
-	(if (or (= delim ?\() (= delim ?\{))
-	    (replace-match (concat "\"(" (if (= delim ?\() "mouse" "face")
+	(if (or (= delim ?\()
+		(= delim ?\{)
+		(= delim ?\«))
+	    (replace-match (concat "\"("
+				   (cond ((= delim ?\() "mouse")
+					 ((= delim ?\{) "face")
+					 (t "balloon"))
 				   " " number " \""))
 	  (replace-match "\")\""))))
     (goto-char (point-max))
@@ -388,9 +400,9 @@
 	     (t
 	      nil)))
 	;; User-defined spec -- find the spec name.
-	(when (= (setq spec (char-after (point))) ?u)
+	(when (eq (setq spec (char-after)) ?u)
 	  (forward-char 1)
-	  (setq user-defined (char-after (point))))
+	  (setq user-defined (char-after)))
 	(forward-char 1)
 	(delete-region spec-beg (point))
 
@@ -500,8 +512,7 @@ If PROPS, insert the result."
 (defun gnus-compile ()
   "Byte-compile the user-defined format specs."
   (interactive)
-  (when gnus-xemacs
-    (error "Can't compile specs under XEmacs"))
+  (require 'bytecomp)
   (let ((entries gnus-format-specs)
 	(byte-compile-warnings '(unresolved callargs redefine))
 	entry gnus-tmp-func)
@@ -512,17 +523,30 @@ If PROPS, insert the result."
 	(setq entry (pop entries))
 	(if (eq (car entry) 'version)
 	    (setq gnus-format-specs (delq entry gnus-format-specs))
-	  (when (and (listp (caddr entry))
-		     (not (eq 'byte-code (caaddr entry))))
-	    (fset 'gnus-tmp-func `(lambda () ,(caddr entry)))
-	    (byte-compile 'gnus-tmp-func)
-	    (setcar (cddr entry) (gnus-byte-code 'gnus-tmp-func)))))
+	  (let ((form (caddr entry)))
+	    (when (and (listp form)
+		       ;; Under GNU Emacs, it's (byte-code ...)
+		       (not (eq 'byte-code (car form)))
+		       ;; Under XEmacs, it's (funcall #<compiled-function ...>)
+		       (not (and (eq 'funcall (car form))
+				 (byte-code-function-p (cadr form)))))
+	      (fset 'gnus-tmp-func `(lambda () ,form))
+	      (byte-compile 'gnus-tmp-func)
+	      (setcar (cddr entry) (gnus-byte-code 'gnus-tmp-func))))))
 
       (push (cons 'version emacs-version) gnus-format-specs)
       ;; Mark the .newsrc.eld file as "dirty".
-      (gnus-dribble-enter " ")
+      (gnus-dribble-touch)
       (gnus-message 7 "Compiling user specs...done"))))
 
+(defun gnus-set-format (type &optional insertable)
+  (set (intern (format "gnus-%s-line-format-spec" type))
+       (gnus-parse-format
+	(symbol-value (intern (format "gnus-%s-line-format" type)))
+	(symbol-value (intern (format "gnus-%s-line-format-alist" type)))
+	insertable)))
+
+
 (provide 'gnus-spec)
 
 ;;; gnus-spec.el ends here