Merge changes from emacs-23 branch

[bpt/emacs.git] / lisp / calc / calc-cplx.el

diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el
index df0ebff..f2e0c49 100644 (file)
--- a/lisp/calc/calc-cplx.el
+++ b/lisp/calc/calc-cplx.el
@@ -1,34 +1,34 @@
-;; Calculator for GNU Emacs, part II [calc-cplx.el]
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
-;; Written by Dave Gillespie, daveg@synaptics.com.
+;;; calc-cplx.el --- Complex number functions for Calc
+
+;; Copyright (C) 1990-1993, 2001-2011 Free Software Foundation, Inc.
+
+;; Author: David Gillespie <daveg@synaptics.com>
+;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
 ;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY.  No author or distributor
-;; accepts responsibility to anyone for the consequences of using it
-;; or for whether it serves any particular purpose or works at all,
-;; unless he says so in writing.  Refer to the GNU Emacs General Public
-;; License for full details.
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
 
-;; Everyone is granted permission to copy, modify and redistribute
-;; GNU Emacs, but only under the conditions described in the
-;; GNU Emacs General Public License.   A copy of this license is
-;; supposed to have been given to you along with GNU Emacs so you
-;; can know your rights and responsibilities.  It should be in a
-;; file named COPYING.  Among other things, the copyright notice
-;; and this notice must be preserved on all copies.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
 
+;;; Code:
 
 ;; This file is autoloaded from calc-ext.el.
-(require 'calc-ext)
 
+(require 'calc-ext)
 (require 'calc-macs)
 
-(defun calc-Need-calc-cplx () nil)
-
-
 (defun calc-argument (arg)
   (interactive "P")
   (calc-slow-wrapper
@@ -61,19 +61,19 @@
   (interactive)
   (calc-wrapper
    (calc-change-mode 'calc-complex-format nil t)
-   (message "Displaying complex numbers in (X,Y) format.")))
+   (message "Displaying complex numbers in (X,Y) format")))
 
 (defun calc-i-notation ()
   (interactive)
   (calc-wrapper
    (calc-change-mode 'calc-complex-format 'i t)
-   (message "Displaying complex numbers in X+Yi format.")))
+   (message "Displaying complex numbers in X+Yi format")))
 
 (defun calc-j-notation ()
   (interactive)
   (calc-wrapper
    (calc-change-mode 'calc-complex-format 'j t)
-   (message "Displaying complex numbers in X+Yj format.")))
+   (message "Displaying complex numbers in X+Yj format")))
 
 
 (defun calc-polar-mode (n)
@@ -84,9 +84,9 @@
         (eq calc-complex-mode 'cplx))
        (progn
         (calc-change-mode 'calc-complex-mode 'polar)
-        (message "Preferred complex form is polar."))
+        (message "Preferred complex form is polar"))
      (calc-change-mode 'calc-complex-mode 'cplx)
-     (message "Preferred complex form is rectangular."))))
+     (message "Preferred complex form is rectangular"))))
 
 
 ;;;; Complex numbers.
@@ -352,4 +352,6 @@
          (t (calc-record-why 'numberp a)
             (list 'calcFunc-im a)))))
 
+(provide 'calc-cplx)
+
 ;;; calc-cplx.el ends here