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

[Juanma Barranquero]

Index: emacs/lisp/abbrev.el
diff -c emacs/lisp/abbrev.el:1.42 emacs/lisp/abbrev.el:1.43
*** emacs/lisp/abbrev.el:1.42   Mon Jul  4 23:08:52 2005
--- emacs/lisp/abbrev.el        Wed Jul 20 10:59:36 2005
***************
*** 281,287 ****
                              name (abbrev-expansion name table))))
        (define-abbrev table (downcase name) exp))))
  
! (defun inverse-add-mode-abbrev (arg)
    "Define last word before point as a mode-specific abbrev.
  With prefix argument N, defines the Nth word before point.
  This command uses the minibuffer to read the expansion.
--- 281,287 ----
                              name (abbrev-expansion name table))))
        (define-abbrev table (downcase name) exp))))
  
! (defun inverse-add-mode-abbrev (n)
    "Define last word before point as a mode-specific abbrev.
  With prefix argument N, defines the Nth word before point.
  This command uses the minibuffer to read the expansion.
***************
*** 292,306 ****
         global-abbrev-table
       (or local-abbrev-table
         (error "No per-mode abbrev table")))
!    "Mode" arg))
  
! (defun inverse-add-global-abbrev (arg)
    "Define last word before point as a global (mode-independent) abbrev.
  With prefix argument N, defines the Nth word before point.
  This command uses the minibuffer to read the expansion.
  Expands the abbreviation after defining it."
    (interactive "p")
!   (inverse-add-abbrev global-abbrev-table "Global" arg))
  
  (defun inverse-add-abbrev (table type arg)
    (let (name exp start end)
--- 292,306 ----
         global-abbrev-table
       (or local-abbrev-table
         (error "No per-mode abbrev table")))
!    "Mode" n))
  
! (defun inverse-add-global-abbrev (n)
    "Define last word before point as a global (mode-independent) abbrev.
  With prefix argument N, defines the Nth word before point.
  This command uses the minibuffer to read the expansion.
  Expands the abbreviation after defining it."
    (interactive "p")
!   (inverse-add-abbrev global-abbrev-table "Global" n))
  
  (defun inverse-add-abbrev (table type arg)
    (let (name exp start end)
***************
*** 338,346 ****
  
  (defun expand-region-abbrevs (start end &optional noquery)
    "For abbrev occurrence in the region, offer to expand it.
! The user is asked to type y or n for each occurrence.
! A prefix argument means don't query; expand all abbrevs.
! If called from a Lisp program, arguments are START END &optional NOQUERY."
    (interactive "r\nP")
    (save-excursion
      (goto-char start)
--- 338,345 ----
  
  (defun expand-region-abbrevs (start end &optional noquery)
    "For abbrev occurrence in the region, offer to expand it.
! The user is asked to type `y' or `n' for each occurrence.
! A prefix argument means don't query; expand all abbrevs."
    (interactive "r\nP")
    (save-excursion
      (goto-char start)