Rename `digit-char-p' to `char-digit-p'.

--=-=-=
Content-Type: text/plain


The name `digit-char-p' was moved to the core here:

2015-02-25  Aidan Kehoe  <[email protected]>

	* cl-extra.el (digit-char-p): Moved to data.c.
	* cl-extra.el (digit-char): Moved to data.c.


Unfortunately, this breaks Gnus which defines the same name.  So:

2015-06-22  Michael Sperber  <[email protected]>

	* keymap.el (synthesize-unicode-codepoint): 
	* cmdloop.el (read-quoted-char-radix): Rename `digit-char-p' to
	`char-digit-p' to avoid a conflict with Gnus.

2015-06-22  Michael Sperber  <[email protected]>

	* data.c (Fset_digit_fixnum_map, Fchar_digit_p, vars_of_data):
	Rename `digit-char-p' to `char-digit-p' to avoid a conflict with
	Gnus.

Hope this is OK.  If not, let me know.  I intend to push on Wednesday if
nobody objects.

-- 
Regards,
Mike

--=-=-=
Content-Type: text/plain
Content-Disposition: inline

diff --git a/lisp/cmdloop.el b/lisp/cmdloop.el
--- a/lisp/cmdloop.el
+++ b/lisp/cmdloop.el
@@ -526,7 +526,7 @@
 
 (defcustom read-quoted-char-radix 8 
   "Radix for \\[quoted-insert] and other uses of `read-quoted-char'.
-See `digit-char-p' and its RADIX argument for possible values."
+See `char-digit-p' and its RADIX argument for possible values."
   :type '(choice (const 8) (const 10) (const 16))
   :group 'editing-basics)
 
@@ -717,7 +717,7 @@
                      (setq unread-command-events 
                            (cons event unread-command-events)
                            done t))))
-		((setq fixnum (digit-char-p char read-quoted-char-radix))
+		((setq fixnum (char-digit-p char read-quoted-char-radix))
 		 (setq code (+ (* code read-quoted-char-radix) fixnum))
 		 (and prompt (setq prompt
 				   (concat prompt " " (list char)))))
diff --git a/lisp/keymap.el b/lisp/keymap.el
--- a/lisp/keymap.el
+++ b/lisp/keymap.el
@@ -524,7 +524,7 @@
     (let* ((prompt first-prompt) (integer 0)
            (extent (make-extent (1- (length first-prompt))
                                 (length first-prompt) prompt))
-	   character digit-char-p)
+	   character char-digit-p)
       (setf (extent-face extent) 'underline
 	    (extent-property extent 'duplicable) t)
       (while (not (member (setq character
@@ -532,8 +532,8 @@
 				;; as GTK does.
 				(read-char-exclusive prompt))
 			  '(?\r ?\n)))
-        (when (setq digit-char-p (digit-char-p character 16))
-          (setq integer (logior (lsh integer 4) digit-char-p)
+        (when (setq char-digit-p (char-digit-p character 16))
+          (setq integer (logior (lsh integer 4) char-digit-p)
                 prompt (concat prompt (list character)))
           (if (>= integer #x110000)
               (error 'args-out-of-range "Not a Unicode code point" integer))
diff --git a/src/data.c b/src/data.c
--- a/src/data.c
+++ b/src/data.c
@@ -1565,7 +1565,7 @@
 Set the value of `digit-fixnum-map', which see.
 
 Also check that RADIX-TABLE is well-formed from the perspective of
-`parse-integer' and `digit-char-p', and create an internal inverse mapping
+`parse-integer' and `char-digit-p', and create an internal inverse mapping
 for `digit-char', so that all three functions behave consistently.
 
 RADIX-TABLE itself is not saved, a read-only copy of it is made and returned.
@@ -1587,7 +1587,7 @@
   return Vdigit_fixnum_map;
 }
 
-DEFUN ("digit-char-p", Fdigit_char_p, 1, 3, 0, /*
+DEFUN ("char-digit-p", Fchar_digit_p, 1, 3, 0, /*
 Return non-nil if CHARACTER represents a digit in base RADIX.
 
 RADIX defaults to ten.  The actual non-nil value returned is the integer
@@ -4193,7 +4193,7 @@
   DEFSUBR (Fnumber_to_string);
   DEFSUBR (Fstring_to_number);
   DEFSUBR (Fset_digit_fixnum_map);
-  DEFSUBR (Fdigit_char_p);
+  DEFSUBR (Fchar_digit_p);
   DEFSUBR (Fdigit_char);
   DEFSUBR (Fparse_integer);
   DEFSUBR (Feqlsign);
@@ -4265,7 +4265,7 @@
 
 This is a character table with fixnum values. A value of -1 indicates this
 character does not have an assigned numeric value. See `parse-integer',
-`digit-char-p', and `digit-char'.
+`char-digit-p', and `digit-char'.
 */);
   Vdigit_fixnum_map = Fmake_char_table (Qgeneric);
   set_char_table_default (Vdigit_fixnum_map, make_fixnum (-1));


--=-=-=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
XEmacs-Patches mailing list
[email protected]
http://lists.xemacs.org/mailman/listinfo/xemacs-patches

--=-=-=--