[Emacs-diffs] Changes to emacs/lisp/subr.el

[Juanma Barranquero]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.327 emacs/lisp/subr.el:1.328
*** emacs/lisp/subr.el:1.327    Thu Oct  3 14:53:43 2002
--- emacs/lisp/subr.el  Thu Oct 17 11:42:10 2002
***************
*** 186,192 ****
      (delete elt (copy-sequence seq))))
  
  (defun remq (elt list)
!   "Return a copy of LIST with all occurences of ELT removed.
  The comparison is done with `eq'."
    (if (memq elt list)
        (delq elt (copy-sequence list))
--- 186,192 ----
      (delete elt (copy-sequence seq))))
  
  (defun remq (elt list)
!   "Return a copy of LIST with all occurrences of ELT removed.
  The comparison is done with `eq'."
    (if (memq elt list)
        (delq elt (copy-sequence list))
***************
*** 244,250 ****
  
  (defun assoc-ignore-representation (key alist)
    "Like `assoc', but ignores differences in text representation.
! KEY must be a string.  
  Unibyte strings are converted to multibyte for comparison."
    (let (element)
      (while (and alist (not element))
--- 244,250 ----
  
  (defun assoc-ignore-representation (key alist)
    "Like `assoc', but ignores differences in text representation.
! KEY must be a string.
  Unibyte strings are converted to multibyte for comparison."
    (let (element)
      (while (and alist (not element))
***************
*** 291,297 ****
  
  ;Moved to keymap.c
  ;(defun copy-keymap (keymap)
! ;  "Return a copy of KEYMAP"  
  ;  (while (not (keymapp keymap))
  ;    (setq keymap (signal 'wrong-type-argument (list 'keymapp keymap))))
  ;  (if (vectorp keymap)
--- 291,297 ----
  
  ;Moved to keymap.c
  ;(defun copy-keymap (keymap)
! ;  "Return a copy of KEYMAP"
  ;  (while (not (keymapp keymap))
  ;    (setq keymap (signal 'wrong-type-argument (list 'keymapp keymap))))
  ;  (if (vectorp keymap)
***************
*** 309,315 ****
    ;; Don't document PREFIX in the doc string because we don't want to
    ;; advertise it.  It's meant for recursive calls only.  Here's its
    ;; meaning
!   
    ;; If optional argument PREFIX is specified, it should be a key
    ;; prefix, a string.  Redefined bindings will then be bound to the
    ;; original key, with PREFIX added at the front.
--- 309,315 ----
    ;; Don't document PREFIX in the doc string because we don't want to
    ;; advertise it.  It's meant for recursive calls only.  Here's its
    ;; meaning
! 
    ;; If optional argument PREFIX is specified, it should be a key
    ;; prefix, a string.  Redefined bindings will then be bound to the
    ;; original key, with PREFIX added at the front.
***************
*** 503,509 ****
    (aset keyboard-translate-table from to))
  
  
! ;;;; The global keymap tree.  
  
  ;;; global-map, esc-map, and ctl-x-map have their values set up in
  ;;; keymap.c; we just give them docstrings here.
--- 503,509 ----
    (aset keyboard-translate-table from to))
  
  
! ;;;; The global keymap tree.
  
  ;;; global-map, esc-map, and ctl-x-map have their values set up in
  ;;; keymap.c; we just give them docstrings here.
***************
*** 1041,1047 ****
  (defun process-kill-without-query (process &optional flag)
    "Say no query needed if PROCESS is running when Emacs is exited.
  Optional second argument if non-nil says to require a query.
! Value is t if a query was formerly required.  
  New code should not use this function; use `process-query-on-exit-flag'
  or `set-process-query-on-exit-flag' instead."
    (let ((old (process-query-on-exit-flag process)))
--- 1041,1047 ----
  (defun process-kill-without-query (process &optional flag)
    "Say no query needed if PROCESS is running when Emacs is exited.
  Optional second argument if non-nil says to require a query.
! Value is t if a query was formerly required.
  New code should not use this function; use `process-query-on-exit-flag'
  or `set-process-query-on-exit-flag' instead."
    (let ((old (process-query-on-exit-flag process)))
***************
*** 1056,1062 ****
  Legitimate radix values are 8, 10 and 16.")
  
  (custom-declare-variable-early
!  'read-quoted-char-radix 8 
   "*Radix for \\[quoted-insert] and other uses of `read-quoted-char'.
  Legitimate radix values are 8, 10 and 16."
    :type '(choice (const 8) (const 10) (const 16))
--- 1056,1062 ----
  Legitimate radix values are 8, 10 and 16.")
  
  (custom-declare-variable-early
!  'read-quoted-char-radix 8
   "*Radix for \\[quoted-insert] and other uses of `read-quoted-char'.
  Legitimate radix values are 8, 10 and 16."
    :type '(choice (const 8) (const 10) (const 16))
***************
*** 1247,1253 ****
    (dolist (elt handle)
      (with-current-buffer (car elt)
        (setq elt (cdr elt))
!       (let ((old-car 
             (if (consp elt) (car elt)))
            (old-cdr
             (if (consp elt) (cdr elt))))
--- 1247,1253 ----
    (dolist (elt handle)
      (with-current-buffer (car elt)
        (setq elt (cdr elt))
!       (let ((old-car
             (if (consp elt) (car elt)))
            (old-cdr
             (if (consp elt) (cdr elt))))
***************
*** 2172,2178 ****
    ;; where the clone is reduced to the empty string (we want the overlay to
    ;; stay when the clone's content is the empty string and we want to use
    ;; `evaporate' to make sure those overlays get deleted when needed).
!   ;; 
    (let* ((pt-end (+ (point) (- end start)))
         (start-margin (if (or (not spreadp) (bobp) (<= start (point-min)))
                           0 1))
--- 2172,2178 ----
    ;; where the clone is reduced to the empty string (we want the overlay to
    ;; stay when the clone's content is the empty string and we want to use
    ;; `evaporate' to make sure those overlays get deleted when needed).
!   ;;
    (let* ((pt-end (+ (point) (- end start)))
         (start-margin (if (or (not spreadp) (bobp) (<= start (point-min)))
                           0 1))
***************
*** 2189,2195 ****
      ;;(overlay-put ol1 'face 'underline)
      (overlay-put ol1 'evaporate t)
      (overlay-put ol1 'text-clones dups)
!     ;; 
      (overlay-put ol2 'modification-hooks '(text-clone-maintain))
      (when spreadp (overlay-put ol2 'text-clone-spreadp t))
      (when syntax (overlay-put ol2 'text-clone-syntax syntax))
--- 2189,2195 ----
      ;;(overlay-put ol1 'face 'underline)
      (overlay-put ol1 'evaporate t)
      (overlay-put ol1 'text-clones dups)
!     ;;
      (overlay-put ol2 'modification-hooks '(text-clone-maintain))
      (when spreadp (overlay-put ol2 'text-clone-spreadp t))
      (when syntax (overlay-put ol2 'text-clone-syntax syntax))