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

[Juanma Barranquero]

Index: emacs/lisp/calc/calc-yank.el
diff -c emacs/lisp/calc/calc-yank.el:1.5 emacs/lisp/calc/calc-yank.el:1.6
*** emacs/lisp/calc/calc-yank.el:1.5    Wed Jan 15 10:16:25 2003
--- emacs/lisp/calc/calc-yank.el        Tue Feb  4 07:47:10 2003
***************
*** 3,9 ****
  ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
! ;; Maintainers: D. Goel <address@hidden> 
  ;;              Colin Walters <address@hidden>
  
  ;; This file is part of GNU Emacs.
--- 3,9 ----
  ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
! ;; Maintainers: D. Goel <address@hidden>
  ;;              Colin Walters <address@hidden>
  
  ;; This file is part of GNU Emacs.
***************
*** 131,137 ****
  
  (defun calc-clean-newlines (s)
    (cond
!    
     ;; Omit leading/trailing whitespace
     ((or (string-match "\\`[ \n\r]+\\([^\001]*\\)\\'" s)
        (string-match "\\`\\([^\001]*\\)[ \n\r]+\\'" s))
--- 131,137 ----
  
  (defun calc-clean-newlines (s)
    (cond
! 
     ;; Omit leading/trailing whitespace
     ((or (string-match "\\`[ \n\r]+\\([^\001]*\\)\\'" s)
        (string-match "\\`\\([^\001]*\\)[ \n\r]+\\'" s))
***************
*** 141,147 ****
     ((string-match "\\`\\(.*\\)[\n\r]+\\([^\001]*\\)\\'" s)
      (calc-clean-newlines (concat (math-match-substring s 1) ","
                                 (math-match-substring s 2))))
!    
     (t s)))
  
  
--- 141,147 ----
     ((string-match "\\`\\(.*\\)[\n\r]+\\([^\001]*\\)\\'" s)
      (calc-clean-newlines (concat (math-match-substring s 1) ","
                                 (math-match-substring s 2))))
! 
     (t s)))