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

[Stefan Monnier]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.668 emacs/lisp/simple.el:1.669
*** emacs/lisp/simple.el:1.668  Mon Nov 29 18:44:29 2004
--- emacs/lisp/simple.el        Fri Dec  3 22:26:13 2004
***************
*** 1,7 ****
  ;;; simple.el --- basic editing commands for Emacs
  
! ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 99,
! ;;               2000, 01, 02, 03, 2004
  ;;        Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
--- 1,7 ----
  ;;; simple.el --- basic editing commands for Emacs
  
! ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! ;;               2000, 2001, 2002, 2003, 2004
  ;;        Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
***************
*** 736,742 ****
  (defun what-line ()
    "Print the current buffer line number and narrowed line number of point."
    (interactive)
!   (let ((opoint (point)) (start (point-min))
        (n (line-number-at-pos)))
      (if (= start 1)
        (message "Line %d" n)
--- 736,742 ----
  (defun what-line ()
    "Print the current buffer line number and narrowed line number of point."
    (interactive)
!   (let ((start (point-min))
        (n (line-number-at-pos)))
      (if (= start 1)
        (message "Line %d" n)
***************
*** 3124,3131 ****
    ;; for intermediate positions.
    (let ((inhibit-point-motion-hooks t)
        (opoint (point))
!       (forward (> arg 0))
!       new line-end line-beg)
      (unwind-protect
        (progn
          (if (not (memq last-command '(next-line previous-line)))
--- 3124,3130 ----
    ;; for intermediate positions.
    (let ((inhibit-point-motion-hooks t)
        (opoint (point))
!       (forward (> arg 0)))
      (unwind-protect
        (progn
          (if (not (memq last-command '(next-line previous-line)))
***************
*** 3928,3943 ****
                   (setq blinkpos (scan-sexps oldpos -1)))
               (error nil)))
           (and blinkpos
!               (save-excursion
!                 (goto-char blinkpos)
!                 (not (looking-at "\\s$")))
                (setq matching-paren
!                     (or (and parse-sexp-lookup-properties
!                              (let ((prop (get-text-property blinkpos 
'syntax-table)))
!                                (and (consp prop)
!                                     (eq (car prop) 4)
!                                     (cdr prop))))
!                         (matching-paren (char-after blinkpos)))
                      mismatch
                      (or (null matching-paren)
                          (/= (char-after (1- oldpos))
--- 3927,3938 ----
                   (setq blinkpos (scan-sexps oldpos -1)))
               (error nil)))
           (and blinkpos
!               (not (eq (car (syntax-after blinkpos)) 8)) ;Not syntax '$'.
                (setq matching-paren
!                     (let ((syntax (syntax-after blinkpos)))
!                       (and (consp syntax)
!                            (eq (car syntax) 4)
!                            (cdr syntax)))
                      mismatch
                      (or (null matching-paren)
                          (/= (char-after (1- oldpos))