11:25 p.m.
changeset: 5285:7d06a8bf47d2
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Tue Jun 08 15:58:47 2010 +0100
files: lisp/ChangeLog lisp/custom.el lisp/gtk-faces.el lisp/obsolete.el
lisp/paragraphs.el src/ChangeLog src/alloc.c
description:
Move #'purecopy from alloc.c to being an obsolete alias for #'identity
lisp/ChangeLog addition:
2010-06-08 Aidan Kehoe <kehoea(a)parhasard.net>
* paragraphs.el (sentence-end):
* gtk-faces.el:
* custom.el (custom-declare-variable):
Remove all core code calls to #'purecopy.
* obsolete.el (purecopy):
Make the function itself an obsolete alias to #'identity.
src/ChangeLog addition:
2010-06-08 Aidan Kehoe <kehoea(a)parhasard.net>
* alloc.c (Fpurecopy):
Moved to obsolete.el as an alias for #'identity, marked obsolete.
diff -r 5efbd1253905 -r 7d06a8bf47d2 lisp/ChangeLog
--- a/lisp/ChangeLog Mon Jun 07 18:42:10 2010 +0100
+++ b/lisp/ChangeLog Tue Jun 08 15:58:47 2010 +0100
＠＠ -1,3 +1,12 ＠＠
+2010-06-08 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * paragraphs.el (sentence-end):
+ * gtk-faces.el:
+ * custom.el (custom-declare-variable):
+ Remove all core code calls to #'purecopy.
+ * obsolete.el (purecopy):
+ Make the function itself an obsolete alias to #'identity.
+
2010-06-06 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-seq.el (reduce):
diff -r 5efbd1253905 -r 7d06a8bf47d2 lisp/custom.el
--- a/lisp/custom.el Mon Jun 07 18:42:10 2010 +0100
+++ b/lisp/custom.el Tue Jun 08 15:58:47 2010 +0100
＠＠ -183,7 +183,7 ＠＠
((eq keyword :require)
(push value requests))
((eq keyword :type)
- (put symbol 'custom-type (purecopy value)))
+ (put symbol 'custom-type value))
((eq keyword :options)
(if (get symbol 'custom-options)
;; Slow safe code to avoid duplicates.
diff -r 5efbd1253905 -r 7d06a8bf47d2 lisp/gtk-faces.el
--- a/lisp/gtk-faces.el Mon Jun 07 18:42:10 2010 +0100
+++ b/lisp/gtk-faces.el Tue Jun 08 15:58:47 2010 +0100
＠＠ -131,36 +131,33 ＠＠
(encoding "[^-]+") ; false!
)
(setq gtk-font-regexp
- (purecopy
- (concat "\\`\\*?[-?*]"
- foundry - family - weight\? - slant\? - swidth - adstyle -
- pixelsize - pointsize - resx - resy - spacing - avgwidth -
- registry - encoding "\\'"
- )))
+ (concat "\\`\\*?[-?*]"
+ foundry - family - weight\? - slant\? - swidth - adstyle -
+ pixelsize - pointsize - resx - resy - spacing - avgwidth -
+ registry - encoding "\\'"
+ ))
(setq gtk-font-regexp-head
- (purecopy
- (concat "\\`[-?*]" foundry - family - weight\? - slant\?
- "\\([-*?]\\|\\'\\)")))
+ (concat "\\`[-?*]" foundry - family - weight\? - slant\?
+ "\\([-*?]\\|\\'\\)"))
(setq gtk-font-regexp-head-2
- (purecopy
- (concat "\\`[-?*]" foundry - family - weight\? - slant\?
- - swidth - adstyle - pixelsize - pointsize
- "\\([-*?]\\|\\'\\)")))
- (setq gtk-font-regexp-slant (purecopy (concat - slant -)))
- (setq gtk-font-regexp-weight (purecopy (concat - weight -)))
+ (concat "\\`[-?*]" foundry - family - weight\? - slant\?
+ - swidth - adstyle - pixelsize - pointsize
+ "\\([-*?]\\|\\'\\)"))
+ (setq gtk-font-regexp-slant (concat - slant -))
+ (setq gtk-font-regexp-weight (concat - weight -))
;; if we can't match any of the more specific regexps (unfortunate) then
;; look for digits; assume 2+ digits is 10ths of points, and 1-2 digits
;; is pixels. Bogus as hell.
- (setq gtk-font-regexp-pixel (purecopy "[-?*]\\([0-9][0-9]?\\)[-?*]"))
- (setq gtk-font-regexp-point (purecopy "[-?*]\\([0-9][0-9]+\\)[-?*]"))
+ (setq gtk-font-regexp-pixel "[-?*]\\([0-9][0-9]?\\)[-?*]")
+ (setq gtk-font-regexp-point "[-?*]\\([0-9][0-9]+\\)[-?*]")
;; the following two are used by x-font-menu.el.
(setq gtk-font-regexp-foundry-and-family
- (purecopy (concat "\\`[-?*]" foundry - "\\(" family "\\)"
-)))
+ (concat "\\`[-?*]" foundry - "\\(" family "\\)" -))
(setq gtk-font-regexp-registry-and-encoding
- (purecopy (concat - "\\(" registry "\\)" - "\\(" encoding
"\\)\\'")))
+ (concat - "\\(" registry "\\)" - "\\(" encoding
"\\)\\'"))
(setq gtk-font-regexp-spacing
- (purecopy (concat - "\\(" spacing "\\)" - avgwidth
- - registry - encoding "\\'")))
+ (concat - "\\(" spacing "\\)" - avgwidth
+ - registry - encoding "\\'"))
)
(defvaralias 'x-font-regexp 'gtk-font-regexp)
diff -r 5efbd1253905 -r 7d06a8bf47d2 lisp/obsolete.el
--- a/lisp/obsolete.el Mon Jun 07 18:42:10 2010 +0100
+++ b/lisp/obsolete.el Tue Jun 08 15:58:47 2010 +0100
＠＠ -425,6 +425,8 ＠＠
;; Keywords already do The Right Thing in XEmacs
(make-compatible 'define-widget-keywords "Just use them")
+(define-function 'purecopy 'identity)
+(make-obsolete 'purecopy "purespace is not available in XEmacs.")
(provide 'obsolete)
;;; obsolete.el ends here
diff -r 5efbd1253905 -r 7d06a8bf47d2 lisp/paragraphs.el
--- a/lisp/paragraphs.el Mon Jun 07 18:42:10 2010 +0100
+++ b/lisp/paragraphs.el Tue Jun 08 15:58:47 2010 +0100
＠＠ -145,18 +145,17 ＠＠
:group 'fill)
(defcustom sentence-end
- (purecopy
- ;; This is a bit stupid since it's not auto-updated when the
- ;; other variables are changed, but it's still useful info.
- (concat (if sentence-end-without-period "\\w \\|")
- "[.?!"
- (if (featurep 'mule)
- (decode-coding-string
"\033$B!#!%!)!*\033$A!##.#?#!\033$(0!$!%!)!*\033$(G!$!%!)!*\033(B"
'iso-2022-7bit)
- "")
- "][]\"')}]*"
- (if sentence-end-double-space
- "\\($\\| $\\|\t\\| \\)" "\\($\\|[\t ]\\)")
- "[ \t\n]*"))
+ ;; This is a bit stupid since it's not auto-updated when the
+ ;; other variables are changed, but it's still useful info.
+ (concat (if sentence-end-without-period "\\w \\|")
+ "[.?!"
+ (if (featurep 'mule)
+ (decode-coding-string
"\033$B!#!%!)!*\033$A!##.#?#!\033$(0!$!%!)!*\033$(G!$!%!)!*\033(B"
'iso-2022-7bit)
+ "")
+ "][]\"')}]*"
+ (if sentence-end-double-space
+ "\\($\\| $\\|\t\\| \\)" "\\($\\|[\t ]\\)")
+ "[ \t\n]*")
"*Regexp describing the end of a sentence.
The value includes the whitespace following the sentence.
All paragraph boundaries also end sentences, regardless.
diff -r 5efbd1253905 -r 7d06a8bf47d2 src/ChangeLog
--- a/src/ChangeLog Mon Jun 07 18:42:10 2010 +0100
+++ b/src/ChangeLog Tue Jun 08 15:58:47 2010 +0100
＠＠ -1,3 +1,8 ＠＠
+2010-06-08 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * alloc.c (Fpurecopy):
+ Moved to obsolete.el as an alias for #'identity, marked obsolete.
+
2010-06-06 Aidan Kehoe <kehoea(a)parhasard.net>
* fns.c (Freduce):
diff -r 5efbd1253905 -r 7d06a8bf47d2 src/alloc.c
--- a/src/alloc.c Mon Jun 07 18:42:10 2010 +0100
+++ b/src/alloc.c Tue Jun 08 15:58:47 2010 +0100
＠＠ -3343,19 +3343,6 ＠＠
free_managed_lcrecord (all_lcrecord_lists[type], rec);
}
#endif /* not NEW_GC */
-
-
-DEFUN ("purecopy", Fpurecopy, 1, 1, 0, /*
-Kept for compatibility, returns its argument.
-Old:
-Make a copy of OBJECT in pure storage.
-Recursively copies contents of vectors and cons cells.
-Does not copy symbols.
-*/
- (object))
-{
- return object;
-}
/************************************************************************/
＠＠ -5722,7 +5709,6 ＠＠
DEFSUBR (Fstring);
DEFSUBR (Fmake_symbol);
DEFSUBR (Fmake_marker);
- DEFSUBR (Fpurecopy);
#ifdef ALLOC_TYPE_STATS
DEFSUBR (Fobject_memory_usage_stats);
DEFSUBR (Ftotal_object_memory_usage);
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches