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

[Miles Bader]

Index: emacs/lisp/dabbrev.el
diff -c emacs/lisp/dabbrev.el:1.64.2.1 emacs/lisp/dabbrev.el:1.64.2.2
*** emacs/lisp/dabbrev.el:1.64.2.1      Fri Apr  4 01:20:01 2003
--- emacs/lisp/dabbrev.el       Tue Oct 14 19:50:53 2003
***************
*** 1,6 ****
  ;;; dabbrev.el --- dynamic abbreviation package
  
! ;; Copyright (C) 1985, 86, 92, 94, 96, 1997, 2000, 2001
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Don Morrison
--- 1,6 ----
  ;;; dabbrev.el --- dynamic abbreviation package
  
! ;; Copyright (C) 1985, 86, 92, 94, 96, 1997, 2000, 01, 2003
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Don Morrison
***************
*** 357,367 ****
  ;; Exported functions
  ;;----------------------------------------------------------------
  
! ;;;###autoload
! (define-key esc-map "/" 'dabbrev-expand)
  ;;;??? Do we want this?
! ;;;###autoload
! (define-key esc-map [?\C-/] 'dabbrev-completion)
  
  ;;;###autoload
  (defun dabbrev-completion (&optional arg)
--- 357,365 ----
  ;; Exported functions
  ;;----------------------------------------------------------------
  
! ;;;###autoload (define-key esc-map "/" 'dabbrev-expand)
  ;;;??? Do we want this?
! ;;;###autoload (define-key esc-map [?\C-/] 'dabbrev-completion)
  
  ;;;###autoload
  (defun dabbrev-completion (&optional arg)
***************
*** 613,628 ****
  (defun dabbrev--goto-start-of-abbrev ()
    ;; Move backwards over abbrev chars
    (save-match-data
!     (if (not (bobp))
!       (progn
!         (forward-char -1)
!         (while (and (looking-at dabbrev--abbrev-char-regexp)
!                     (not (bobp))
!                     (not (= (point) (field-beginning (point) nil
!                                                      (1- (point))))))
!           (forward-char -1))
!         (or (looking-at dabbrev--abbrev-char-regexp)
!             (forward-char 1))))
      (and dabbrev-abbrev-skip-leading-regexp
         (while (looking-at dabbrev-abbrev-skip-leading-regexp)
           (forward-char 1)))))
--- 611,625 ----
  (defun dabbrev--goto-start-of-abbrev ()
    ;; Move backwards over abbrev chars
    (save-match-data
!     (when (> (point) (minibuffer-prompt-end))
!       (forward-char -1)
!       (while (and (looking-at dabbrev--abbrev-char-regexp)
!                 (> (point) (minibuffer-prompt-end))
!                 (not (= (point) (field-beginning (point) nil
!                                                  (1- (point))))))
!       (forward-char -1))
!       (or (looking-at dabbrev--abbrev-char-regexp)
!         (forward-char 1)))
      (and dabbrev-abbrev-skip-leading-regexp
         (while (looking-at dabbrev-abbrev-skip-leading-regexp)
           (forward-char 1)))))
***************
*** 854,860 ****
  
  (defun dabbrev--safe-replace-match (string &optional fixedcase literal)
    (if (eq major-mode 'picture-mode)
!       (picture-replace-match string fixedcase literal)
      (replace-match string fixedcase literal)))
  
  ;;;----------------------------------------------------------------
--- 851,858 ----
  
  (defun dabbrev--safe-replace-match (string &optional fixedcase literal)
    (if (eq major-mode 'picture-mode)
!       (with-no-warnings
!        (picture-replace-match string fixedcase literal))
      (replace-match string fixedcase literal)))
  
  ;;;----------------------------------------------------------------
***************
*** 1030,1033 ****
--- 1028,1032 ----
  
  (provide 'dabbrev)
  
+ ;;; arch-tag: 29e58596-f080-4306-a409-70296cf9d46f
  ;;; dabbrev.el ends here