Seiji Zenitani
zenit****@users*****
2005年 10月 31日 (月) 23:00:44 JST
Index: CarbonEmacsPackage/GPL/ac-mode.el diff -u CarbonEmacsPackage/GPL/ac-mode.el:1.1 CarbonEmacsPackage/GPL/ac-mode.el:1.2 --- CarbonEmacsPackage/GPL/ac-mode.el:1.1 Sun Oct 23 13:18:03 2005 +++ CarbonEmacsPackage/GPL/ac-mode.el Mon Oct 31 23:00:44 2005 @@ -682,4 +682,4 @@ (provide 'ac-mode) -; $Id: ac-mode.el,v 1.1 2005/10/23 04:18:03 zenitani Exp $ +; $Id: ac-mode.el,v 1.2 2005/10/31 14:00:44 zenitani Exp $ Index: CarbonEmacsPackage/GPL/crontab-mode.el diff -u CarbonEmacsPackage/GPL/crontab-mode.el:1.1 CarbonEmacsPackage/GPL/crontab-mode.el:1.2 --- CarbonEmacsPackage/GPL/crontab-mode.el:1.1 Sun Oct 23 13:18:03 2005 +++ CarbonEmacsPackage/GPL/crontab-mode.el Mon Oct 31 23:00:44 2005 @@ -2,7 +2,7 @@ ;; ;; ~/share/emacs/pkg/crontab/crontab-mode.el --- ;; -;; $Id: crontab-mode.el,v 1.1 2005/10/23 04:18:03 zenitani Exp $ +;; $Id: crontab-mode.el,v 1.2 2005/10/31 14:00:44 zenitani Exp $ ;; ;; Author: Harley Gorrell <harle****@mahal*****> Index: CarbonEmacsPackage/GPL/html-helper-mode.el diff -u CarbonEmacsPackage/GPL/html-helper-mode.el:1.1 CarbonEmacsPackage/GPL/html-helper-mode.el:1.2 --- CarbonEmacsPackage/GPL/html-helper-mode.el:1.1 Sun Oct 23 13:18:03 2005 +++ CarbonEmacsPackage/GPL/html-helper-mode.el Mon Oct 31 23:00:44 2005 @@ -26,7 +26,7 @@ ;; URL: http://www.gest.unipd.it/~saint/html-helper-mode.el.gz ;; Created: 01 Feb 1994 -;; $Id: html-helper-mode.el,v 1.1 2005/10/23 04:18:03 zenitani Exp $ +;; $Id: html-helper-mode.el,v 1.2 2005/10/31 14:00:44 zenitani Exp $ ;; Keywords: HTML major-mode ;; LCD Archive Entry: @@ -117,7 +117,7 @@ (defconst html-helper-mode-version (progn - (let ((revs "$Revision: 1.1 $") + (let ((revs "$Revision: 1.2 $") (lastchar 0)) ; revs is a string of single byte characters (set 'lastchar (1- (string-width revs))) Index: CarbonEmacsPackage/GPL/htmlize.el diff -u CarbonEmacsPackage/GPL/htmlize.el:1.2 CarbonEmacsPackage/GPL/htmlize.el:1.3 --- CarbonEmacsPackage/GPL/htmlize.el:1.2 Mon Oct 24 20:57:09 2005 +++ CarbonEmacsPackage/GPL/htmlize.el Mon Oct 31 23:00:44 2005 @@ -1,6 +1,6 @@ ;; htmlize.el -- Convert buffer text and decorations to HTML. -;; Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2005 Hrvoje Niksic +;; Copyright (C) 1997,1998,1999,2000,2001,2002,2003 Hrvoje Niksic ;; Author: Hrvoje Niksic <hniks****@xemac*****> ;; Keywords: hypermedia, extensions @@ -70,8 +70,8 @@ ;; Thanks go to the multitudes of people who have sent reports and ;; contributed comments, suggestions, and fixes. They include Ron -;; Gut, Bob Weiner, Toni Drabik, Peter Breton, Thomas Vogels, Juri -;; Linkov, and many others. +;; Gut, Bob Weiner, Toni Drabik, Peter Breton, Thomas Vogels and many +;; others. ;; User quotes: "You sir, are a sick, sick, _sick_ person. :)" ;; -- Bill Perry, author of Emacs/W3 @@ -93,7 +93,7 @@ ;; `cl' is loaded. (load "cl-extra"))) -(defconst htmlize-version "1.21") +(defconst htmlize-version "1.16") ;; Incantations to make custom stuff work without customize, e.g. on ;; XEmacs 19.14 or GNU Emacs 19.34. @@ -159,14 +159,6 @@ :type 'string :group 'htmlize) -(defcustom htmlize-replace-form-feeds t - "*Non-nil means replace form feed characters in source code with <hr />. -If this is a string, it additionally specifies the replacement to use. -If you need more elaborate processing, set this to nil and use -htmlize-after-hook." - :type 'boolean - :group 'htmlize) - (defcustom htmlize-html-charset nil "*The charset declared by the resulting HTML documents. When non-nil, causes htmlize to insert the following in the HEAD section @@ -431,8 +423,8 @@ (setf (gethash char htmlize-extended-character-cache) (format "&#%d;" char))) ((and (fboundp 'encode-char) - ;; Must check if encode-char works for CHAR; - ;; it fails for Arabic and possibly elsewhere. + ;; Have to check: encode-char fails for Arabic + ;; and possibly other chars. (encode-char char 'ucs)) (setf (gethash char htmlize-extended-character-cache) (format "&#%d;" (encode-char char 'ucs)))) @@ -550,16 +542,6 @@ ;; <http://www.mail-archive.com/bbdb-****@xemac*****/> ;; <hniks****@xemac*****> ;; <xalan-dev-sc.10148567319.hacuhiucknfgmpfnjcpg-john=doe.c****@xml*****> - -(defun htmlize-defang-local-variables () - ;; Juri Linkov reports that an HTML-ized "Local variables" can lead - ;; visiting the HTML to fail with "Local variables list is not - ;; properly terminated". He suggested changing the phrase to - ;; syntactically equivalent HTML that Emacs doesn't recognize. - (goto-char (point-min)) - (while (search-forward "Local Variables:" nil t) - (replace-match "Local Variables:" nil t))) - ;;; Color handling. @@ -651,18 +633,7 @@ ;; return "unspecified-fg" or "unspecified-bg". If the face is ;; `default' and the color is unspecified, look up the color in ;; frame parameters. - (let* ((function (if fg #'face-foreground #'face-background)) - color) - (if (>= emacs-major-version 22) - ;; For GNU Emacs 22+ set INHERIT to get the inherited values. - (setq color (funcall function face nil t)) - (setq color (funcall function face)) - (when (and (null color) - (fboundp 'face-attribute) - (face-attribute face :inherit) - (not (eq (face-attribute face :inherit) 'unspecified))) - (setq color (htmlize-face-color-internal - (face-attribute face :inherit) fg)))) + (let ((color (if fg (face-foreground face) (face-background face)))) (when (and (eq face 'default) (null color)) (setq color (cdr (assq (if fg 'foreground-color 'background-color) (frame-parameters))))) @@ -805,12 +776,9 @@ (setf (htmlize-fstruct-underlinep fstruct) (face-underline-p face)))) ((fboundp 'face-attribute) - ;; GNU Emacs 21 and further. + ;; GNU Emacs 21. (dolist (attr '(:weight :slant :underline :overline :strike-through)) - (let ((value (if (>= emacs-major-version 22) - ;; Use the INHERIT arg in GNU Emacs 22. - (face-attribute face attr nil t) - (face-attribute face attr)))) + (let ((value (face-attribute face attr))) (when (and value (not (eq value 'unspecified))) (htmlize-face-emacs21-attr fstruct attr value))))) (t @@ -932,12 +900,6 @@ (push new-name css-names))))) face-map)) -(defun htmlize-unstringify-face (face) - "If FACE is a string, return it interned, otherwise return it unchanged." - (if (stringp face) - (intern face) - face)) - (defun htmlize-faces-in-buffer () "Return a list of faces used in the current buffer. Under XEmacs, this returns the set of faces specified by the extents @@ -969,20 +931,16 @@ next (or (next-single-property-change pos 'face) (point-max))) ;; FACE-PROP can be a face/attrlist or a list thereof. (setq faces (if (htmlize-face-list-p face-prop) - (union (mapcar #'htmlize-unstringify-face face-prop) - faces :test 'equal) - (adjoin (htmlize-unstringify-face face-prop) - faces :test 'equal))) + (union face-prop faces :test 'equal) + (adjoin face-prop faces :test 'equal))) (setq pos next))) ;; Faces used by overlays. (dolist (overlay (overlays-in (point-min) (point-max))) (let ((face-prop (overlay-get overlay 'face))) ;; FACE-PROP can be a face/attrlist or a list thereof. (setq faces (if (htmlize-face-list-p face-prop) - (union (mapcar #'htmlize-unstringify-face face-prop) - faces :test 'equal) - (adjoin (htmlize-unstringify-face face-prop) - faces :test 'equal)))))) + (union face-prop faces :test 'equal) + (adjoin face-prop faces :test 'equal)))))) faces)) ;; htmlize-faces-at-point returns the faces in use at point. The @@ -1010,9 +968,8 @@ ;; Faces from text properties. (let ((face-prop (get-text-property (point) 'face))) (setq all-faces (if (htmlize-face-list-p face-prop) - (nreverse (mapcar #'htmlize-unstringify-face - face-prop)) - (list (htmlize-unstringify-face face-prop))))) + (reverse face-prop) + (list face-prop)))) ;; Faces from overlays. (let ((overlays ;; Collect overlays at point that specify `face'. @@ -1034,11 +991,8 @@ (dolist (overlay overlays) (setq face-prop (overlay-get overlay 'face)) (setq list (if (htmlize-face-list-p face-prop) - (nconc (nreverse (mapcar - #'htmlize-unstringify-face - face-prop)) - list) - (cons (htmlize-unstringify-face face-prop) list)))) + (nconc (reverse face-prop) list) + (cons face-prop list)))) (setq all-faces (nconc all-faces list))))))) ;; htmlize supports generating HTML in two several fundamentally @@ -1298,21 +1252,11 @@ (funcall insert-text-method text fstruct-list htmlbuf)) (goto-char next-change))) - ;; Insert the epilog and post-process the buffer. + ;; Insert the epilog. (with-current-buffer htmlbuf (insert "</pre>\n </body>\n</html>\n") (when htmlize-generate-hyperlinks (htmlize-make-hyperlinks)) - (htmlize-defang-local-variables) - (when htmlize-replace-form-feeds - ;; Change each "^L\n" to "\n<hr/>". - (goto-char (point-min)) - (let ((replacement - (concat "\n" (if (stringp htmlize-replace-form-feeds) - htmlize-replace-form-feeds - "<hr />")))) - (while (search-forward "\n" nil t) - (replace-match replacement t t)))) (goto-char (point-min)) (when htmlize-html-major-mode ;; What sucks about this is that the minor modes, most notably Index: CarbonEmacsPackage/GPL/quack.el diff -u CarbonEmacsPackage/GPL/quack.el:1.1 CarbonEmacsPackage/GPL/quack.el:1.2 --- CarbonEmacsPackage/GPL/quack.el:1.1 Sun Oct 23 13:18:03 2005 +++ CarbonEmacsPackage/GPL/quack.el Mon Oct 31 23:00:44 2005 @@ -21,7 +21,7 @@ see the file `COPYING'. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.") -(defconst quack-cvsid "$Id: quack.el,v 1.1 2005/10/23 04:18:03 zenitani Exp $") +(defconst quack-cvsid "$Id: quack.el,v 1.2 2005/10/31 14:00:44 zenitani Exp $") ;;; Commentary: Index: CarbonEmacsPackage/GPL/xdvi-search.el diff -u CarbonEmacsPackage/GPL/xdvi-search.el:1.1 CarbonEmacsPackage/GPL/xdvi-search.el:1.2 --- CarbonEmacsPackage/GPL/xdvi-search.el:1.1 Sun Oct 23 13:18:03 2005 +++ CarbonEmacsPackage/GPL/xdvi-search.el Mon Oct 31 23:00:44 2005 @@ -6,7 +6,7 @@ ;;; ;;; This file is available from: http://xdvi.sourceforge.net/xdvi-search.el ;;; -;;; $Revision: 1.1 $, tested with Emacs 20.4 to 21.2 and Xemacs 21.1 to 21.5 +;;; $Revision: 1.2 $, tested with Emacs 20.4 to 21.2 and Xemacs 21.1 to 21.5 ;;; ;;; This program is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU General Public License
