diff options
author | Hans de Graaff <graaff@gentoo.org> | 2008-04-09 06:29:28 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2008-04-09 06:29:28 +0000 |
commit | 176ccc4db1f2c068a67bfad866863c184a35fbc4 (patch) | |
tree | a513b6059bc08d7ee3b9cbd1a8fcfc0eeafb3cd6 /app-editors/xemacs/files | |
parent | Version bump (diff) | |
download | gentoo-2-176ccc4db1f2c068a67bfad866863c184a35fbc4.tar.gz gentoo-2-176ccc4db1f2c068a67bfad866863c184a35fbc4.tar.bz2 gentoo-2-176ccc4db1f2c068a67bfad866863c184a35fbc4.zip |
Remove old versions
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-editors/xemacs/files')
-rw-r--r-- | app-editors/xemacs/files/font-lock-keywords.patch | 224 | ||||
-rw-r--r-- | app-editors/xemacs/files/font-lock-warning-face.patch | 19 | ||||
-rw-r--r-- | app-editors/xemacs/files/xemacs-21.4.20-linuxplay.patch | 29 |
3 files changed, 0 insertions, 272 deletions
diff --git a/app-editors/xemacs/files/font-lock-keywords.patch b/app-editors/xemacs/files/font-lock-keywords.patch deleted file mode 100644 index 15a21f5ecdd0..000000000000 --- a/app-editors/xemacs/files/font-lock-keywords.patch +++ /dev/null @@ -1,224 +0,0 @@ ---- font-lock.el 2006-06-04 18:05:28.000000000 +0200 -+++ ../../xemacs-21.5/lisp/font-lock.el 2007-06-23 09:13:48.000000000 +0200 -@@ -441,6 +449,32 @@ - Be very careful composing regexps for this list; the wrong pattern can - dramatically slow things down! - ") -+ -+(defvar font-lock-keywords-alist nil -+ "Alist of additional `font-lock-keywords' elements for major modes. -+ -+Each element has the form (MODE KEYWORDS . HOW). -+`font-lock-set-defaults' adds the elements in the list KEYWORDS to -+`font-lock-keywords' when Font Lock is turned on in major mode MODE. -+ -+If HOW is nil, KEYWORDS are added at the beginning of -+`font-lock-keywords'. If it is `set', they are used to replace the -+value of `font-lock-keywords'. If HOW is any other non-nil value, -+they are added at the end. -+ -+This is normally set via `font-lock-add-keywords' and -+`font-lock-remove-keywords'.") -+ -+(defvar font-lock-removed-keywords-alist nil -+ "Alist of `font-lock-keywords' elements to be removed for major modes. -+ -+Each element has the form (MODE . KEYWORDS). `font-lock-set-defaults' -+removes the elements in the list KEYWORDS from `font-lock-keywords' -+when Font Lock is turned on in major mode MODE. -+ -+This is normally set via `font-lock-add-keywords' and -+`font-lock-remove-keywords'.") -+ - ;;;###autoload - (make-variable-buffer-local 'font-lock-keywords) - -@@ -860,6 +899,188 @@ - (setq font-lock-maximum-decoration t) - (font-lock-recompute-variables))) - -+(defun font-lock-add-keywords (mode keywords &optional how) -+ "Add highlighting KEYWORDS for MODE. -+ -+MODE should be a symbol, the major mode command name, such as `c-mode' -+or nil. If nil, highlighting keywords are added for the current buffer. -+KEYWORDS should be a list; see the variable `font-lock-keywords'. -+By default they are added at the beginning of the current highlighting list. -+If optional argument HOW is `set', they are used to replace the current -+highlighting list. If HOW is any other non-nil value, they are added at the -+end of the current highlighting list. -+ -+For example: -+ -+ (font-lock-add-keywords 'c-mode -+ '((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 font-lock-warning-face prepend) -+ (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" . font-lock-keyword-face))) -+ -+adds two fontification patterns for C mode, to fontify `FIXME:' words, even in -+comments, and to fontify `and', `or' and `not' words as keywords. -+ -+The above procedure will only add the keywords for C mode, not -+for modes derived from C mode. To add them for derived modes too, -+pass nil for MODE and add the call to c-mode-hook. -+ -+For example: -+ -+ (add-hook 'c-mode-hook -+ (lambda () -+ (font-lock-add-keywords nil -+ '((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 font-lock-warning-face prepend) -+ (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" . -+ font-lock-keyword-face))))) -+ -+The above procedure may fail to add keywords to derived modes if -+some involved major mode does not follow the standard conventions. -+File a bug report if this happens, so the major mode can be corrected. -+ -+Note that some modes have specialized support for additional patterns, e.g., -+see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types', -+`objc-font-lock-extra-types' and `java-font-lock-extra-types'." -+ (cond (mode -+ ;; If MODE is non-nil, add the KEYWORDS and HOW spec to -+ ;; `font-lock-keywords-alist' so `font-lock-set-defaults' uses them. -+ (let ((spec (cons keywords how)) cell) -+ (if (setq cell (assq mode font-lock-keywords-alist)) -+ (if (eq how 'set) -+ (setcdr cell (list spec)) -+ (setcdr cell (append (cdr cell) (list spec)))) -+ (push (list mode spec) font-lock-keywords-alist))) -+ ;; Make sure that `font-lock-removed-keywords-alist' does not -+ ;; contain the new keywords. -+ (font-lock-update-removed-keyword-alist mode keywords how)) -+ (t -+ ;; Otherwise set or add the keywords now. -+ ;; This is a no-op if it has been done already in this buffer -+ ;; for the correct major mode. -+ (font-lock-set-defaults) -+ (let ((was-compiled (eq (car font-lock-keywords) t))) -+ ;; Bring back the user-level (uncompiled) keywords. -+ (if was-compiled -+ (setq font-lock-keywords (cadr font-lock-keywords))) -+ ;; Now modify or replace them. -+ (if (eq how 'set) -+ (setq font-lock-keywords keywords) -+ (font-lock-remove-keywords nil keywords) ;to avoid duplicates -+ (let ((old (if (eq (car-safe font-lock-keywords) t) -+ (cdr font-lock-keywords) -+ font-lock-keywords))) -+ (setq font-lock-keywords (if how -+ (append old keywords) -+ (append keywords old))))) -+ ;; If the keywords were compiled before, compile them again. -+ (if was-compiled -+ (setq font-lock-keywords -+ (font-lock-compile-keywords font-lock-keywords))))))) -+ -+(defun font-lock-update-removed-keyword-alist (mode keywords how) -+ "Update `font-lock-removed-keywords-alist' when adding new KEYWORDS to MODE." -+ ;; When font-lock is enabled first all keywords in the list -+ ;; `font-lock-keywords-alist' are added, then all keywords in the -+ ;; list `font-lock-removed-keywords-alist' are removed. If a -+ ;; keyword was once added, removed, and then added again it must be -+ ;; removed from the removed-keywords list. Otherwise the second add -+ ;; will not take effect. -+ (let ((cell (assq mode font-lock-removed-keywords-alist))) -+ (if cell -+ (if (eq how 'set) -+ ;; A new set of keywords is defined. Forget all about -+ ;; our old keywords that should be removed. -+ (setq font-lock-removed-keywords-alist -+ (delq cell font-lock-removed-keywords-alist)) -+ ;; Delete all previously removed keywords. -+ (dolist (kword keywords) -+ (setcdr cell (delete kword (cdr cell)))) -+ ;; Delete the mode cell if empty. -+ (if (null (cdr cell)) -+ (setq font-lock-removed-keywords-alist -+ (delq cell font-lock-removed-keywords-alist))))))) -+ -+;; Written by Anders Lindgren <andersl@andersl.com>. -+;; -+;; Case study: -+;; (I) The keywords are removed from a major mode. -+;; In this case the keyword could be local (i.e. added earlier by -+;; `font-lock-add-keywords'), global, or both. -+;; -+;; (a) In the local case we remove the keywords from the variable -+;; `font-lock-keywords-alist'. -+;; -+;; (b) The actual global keywords are not known at this time. -+;; All keywords are added to `font-lock-removed-keywords-alist', -+;; when font-lock is enabled those keywords are removed. -+;; -+;; Note that added keywords are taken out of the list of removed -+;; keywords. This ensure correct operation when the same keyword -+;; is added and removed several times. -+;; -+;; (II) The keywords are removed from the current buffer. -+(defun font-lock-remove-keywords (mode keywords) -+ "Remove highlighting KEYWORDS for MODE. -+ -+MODE should be a symbol, the major mode command name, such as `c-mode' -+or nil. If nil, highlighting keywords are removed for the current buffer. -+ -+To make the removal apply to modes derived from MODE as well, -+pass nil for MODE and add the call to MODE-hook. This may fail -+for some derived modes if some involved major mode does not -+follow the standard conventions. File a bug report if this -+happens, so the major mode can be corrected." -+ (cond (mode -+ ;; Remove one keyword at the time. -+ (dolist (keyword keywords) -+ (let ((top-cell (assq mode font-lock-keywords-alist))) -+ ;; If MODE is non-nil, remove the KEYWORD from -+ ;; `font-lock-keywords-alist'. -+ (when top-cell -+ (dolist (keyword-list-how-pair (cdr top-cell)) -+ ;; `keywords-list-how-pair' is a cons with a list of -+ ;; keywords in the car top-cell and the original how -+ ;; argument in the cdr top-cell. -+ (setcar keyword-list-how-pair -+ (delete keyword (car keyword-list-how-pair)))) -+ ;; Remove keyword list/how pair when the keyword list -+ ;; is empty and how doesn't specify `set'. (If it -+ ;; should be deleted then previously deleted keywords -+ ;; would appear again.) -+ (let ((cell top-cell)) -+ (while (cdr cell) -+ (if (and (null (car (car (cdr cell)))) -+ (not (eq (cdr (car (cdr cell))) 'set))) -+ (setcdr cell (cdr (cdr cell))) -+ (setq cell (cdr cell))))) -+ ;; Final cleanup, remove major mode cell if last keyword -+ ;; was deleted. -+ (if (null (cdr top-cell)) -+ (setq font-lock-keywords-alist -+ (delq top-cell font-lock-keywords-alist)))) -+ ;; Remember the keyword in case it is not local. -+ (let ((cell (assq mode font-lock-removed-keywords-alist))) -+ (if cell -+ (unless (member keyword (cdr cell)) -+ (nconc cell (list keyword))) -+ (push (cons mode (list keyword)) -+ font-lock-removed-keywords-alist)))))) -+ (t -+ ;; Otherwise remove it immediately. -+ (font-lock-set-defaults) -+ (let ((was-compiled (eq (car font-lock-keywords) t))) -+ ;; Bring back the user-level (uncompiled) keywords. -+ (if was-compiled -+ (setq font-lock-keywords (cadr font-lock-keywords))) -+ -+ ;; Edit them. -+ (setq font-lock-keywords (copy-sequence font-lock-keywords)) -+ (dolist (keyword keywords) -+ (setq font-lock-keywords -+ (delete keyword font-lock-keywords))) -+ -+ ;; If the keywords were compiled before, compile them again. -+ (if was-compiled -+ (setq font-lock-keywords -+ (font-lock-compile-keywords font-lock-keywords))))))) - - ;;;;;;;;;;;;;;;;;;;;;; actual code ;;;;;;;;;;;;;;;;;;;;;; - diff --git a/app-editors/xemacs/files/font-lock-warning-face.patch b/app-editors/xemacs/files/font-lock-warning-face.patch deleted file mode 100644 index 176bb399e498..000000000000 --- a/app-editors/xemacs/files/font-lock-warning-face.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: font-lock.el -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font-lock.el,v -retrieving revision 1.31 -diff -u -B -r1.31 font-lock.el ---- lisp/font-lock.el 2006/11/01 23:14:33 1.31 -+++ lisp/font-lock.el 2007/06/23 07:14:17 -@@ -721,6 +721,11 @@ - It is present only for horrid FSF compatibility reasons. - The corresponding face should be set using `edit-faces' or the - `set-face-*' functions.") -+(defvar font-lock-warning-face 'font-lock-warning-face -+ "This variable should not be set. -+It is present only for horrid FSF compatibility reasons. -+The corresponding face should be set using `edit-faces' or the -+`set-face-*' functions.") - - (defconst font-lock-face-list - '(font-lock-comment-face diff --git a/app-editors/xemacs/files/xemacs-21.4.20-linuxplay.patch b/app-editors/xemacs/files/xemacs-21.4.20-linuxplay.patch deleted file mode 100644 index 485c768fe528..000000000000 --- a/app-editors/xemacs/files/xemacs-21.4.20-linuxplay.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: linuxplay.c -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/linuxplay.c,v -retrieving revision 1.13 -diff -u -B -r1.13 linuxplay.c ---- src/linuxplay.c 2001/04/12 18:23:58 1.13 -+++ src/linuxplay.c 2006/12/22 07:15:06 -@@ -290,7 +290,8 @@ - fmtType ffmt; - int fmt,speed,tracks; - unsigned char *pptr,*optr,*cptr,*sptr; -- int wrtn,rrtn,crtn,prtn; -+ int wrtn,crtn; -+ size_t prtn,rrtn; - unsigned char sndbuf[SNDBUFSZ]; - - /* We need to read at least the header information before we can start -@@ -338,9 +339,9 @@ - device; repeat until all data has been processed */ - rrtn = length; - do { -- for (pptr = data; (prtn = parsesndfile((void **)&pptr,(size_t *)&rrtn, -+ for (pptr = data; (prtn = parsesndfile((void **)&pptr, &rrtn, - (void **)&optr)) > 0; ) -- for (cptr = optr; (crtn = sndcnv((void **)&cptr,(size_t *) &prtn, -+ for (cptr = optr; (crtn = sndcnv((void **)&cptr, &prtn, - (void **)&sptr)) > 0; ) { - for (;;) { - if ((wrtn = write(audio_fd,sptr,crtn)) < 0) { |