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

[Richard M . Stallman]

Index: emacs/lisp/emulation/vi.el
diff -c emacs/lisp/emulation/vi.el:1.26 emacs/lisp/emulation/vi.el:1.27
*** emacs/lisp/emulation/vi.el:1.26     Tue Jun 14 11:31:43 2005
--- emacs/lisp/emulation/vi.el  Sun Jul  3 16:25:59 2005
***************
*** 314,320 ****
  (put 'mark-defun 'point-moving-unit 'region)
  (put 'mark-whole-buffer 'point-moving-unit 'region)
  (put 'mark-end-of-sentence 'point-moving-unit 'region)
! (put 'mark-c-function 'point-moving-unit 'region)
  ;;;
  
  (defvar vi-mark-alist nil
--- 314,320 ----
  (put 'mark-defun 'point-moving-unit 'region)
  (put 'mark-whole-buffer 'point-moving-unit 'region)
  (put 'mark-end-of-sentence 'point-moving-unit 'region)
! (put 'c-mark-function 'point-moving-unit 'region)
  ;;;
  
  (defvar vi-mark-alist nil
***************
*** 637,643 ****
     "Go to ARGth line."
     (interactive "P")
     (if (null (vi-raw-numeric-prefix arg))
!        (end-of-buffer)
       (goto-line (vi-prefix-numeric-value arg))))
  
  (defun vi-beginning-of-buffer ()
--- 637,644 ----
     "Go to ARGth line."
     (interactive "P")
     (if (null (vi-raw-numeric-prefix arg))
!        (with-no-warnings
!        (end-of-buffer))
       (goto-line (vi-prefix-numeric-value arg))))
  
  (defun vi-beginning-of-buffer ()
***************
*** 1384,1390 ****
        ((char-equal region ?b) (mark-whole-buffer))
        ((char-equal region ?p) (mark-paragraph))
        ((char-equal region ?P) (mark-page arg))
!       ((char-equal region ?f) (mark-c-function))
        ((char-equal region ?w) (mark-word arg))
        ((char-equal region ?e) (mark-end-of-sentence arg))
        ((char-equal region ?l) (vi-mark-lines arg))
--- 1385,1391 ----
        ((char-equal region ?b) (mark-whole-buffer))
        ((char-equal region ?p) (mark-paragraph))
        ((char-equal region ?P) (mark-page arg))
!       ((char-equal region ?f) (c-mark-function))
        ((char-equal region ?w) (mark-word arg))
        ((char-equal region ?e) (mark-end-of-sentence arg))
        ((char-equal region ?l) (vi-mark-lines arg))