Anonymous avatar Anonymous committed 16ae7dc

Replace obsolete symbols with modern names

Comments (0)

Files changed (13)

+1998-07-18  SL Baur  <steve@altair.xemacs.org>
+
+	* calc-yank.el (calc-edit): screen-width -> frame-width.
+	(calc-show-edit-buffer): Ditto.
+
+	* calc-store.el (calc-edit-variable): screen-width -> frame-width.
+
+	* calc-sel.el (calc-edit-selection): screen-width -> frame-width.
+
+	* calc-prog.el (calc-user-define-edit): screen-width -> frame-width.
+	(calc-kbd-loop): executing-macro -> executing-kbd-macro.
+	(calc-kbd-push): Ditto.
+	(calc-kbd-report): Ditto.
+	(calc-kbd-query): Ditto.
+
+	* calc-mode.el (calc-save-modes): executing-macro ->
+	executing-kbd-macro.
+
+	* calc-misc.el (calc-big-or-small): screen-width -> frame-width,
+	screen-height -> frame-height.
+	(math-do-working): executing-macro -> executing-kbd-macro.
+
+	* calc-graph.el (calc-graph-plot): screen-width -> frame-width,
+	screen-height -> frame-height.
+	(calc-graph-view): screen-height -> frame-height.
+
+	* calc-embed.el (calc-do-embedded): y-or-n-p only accepts one
+	argument.
+	(calc-embedded-edit): screen-width -> frame-width.
+
+	* calc-aent.el (calc-do-quick-calc): screen-width -> frame-width.
+
+	* calc.el (calc): screen-width -> frame-width.
+	(calc-quit): screen-width -> frame-width, screen-height ->
+	frame-height.
+	(calc-window-width): screen-width -> frame-width.
+
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* calc-aent.el (calc-do-alg-entry): blink-paren-hook has long been 
+	renamed to blink-paren-function.
+
+	* calc-maint.el (calc-add-autoloads): `trim-versions-without-asking'
+	was renamed to `delete-old-versions' many years ago.
+
 1998-02-27  Greg Klanderman  <greg@alphatech.com>
 
 	* calc.el (calc-init-base): replace bindings of
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.05
-AUTHOR_VERSION = 2.02fX1
+VERSION = 1.06
+AUTHOR_VERSION = 2.02fX2
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = calc
 PKG_TYPE = regular
 				    (format ", \"%c\"" (car alg-exp))
 				  "")
 				")")))
-	  (if (and (< (length buf) (screen-width)) (= (length entry) 1)
+	  (if (and (< (length buf) (frame-width)) (= (length entry) 1)
 		   calc-extensions-loaded)
 	      (let ((long (concat (math-format-value (car entry) 1000)
 				  " =>  " buf)))
-		(if (<= (length long) (- (screen-width) 8))
+		(if (<= (length long) (- (frame-width) 8))
 		    (setq buf long))))
 	  (calc-handle-whys)
 	  (message "Result: %s" buf)))
 
 (defun calc-do-alg-entry (&optional initial prompt no-normalize)
   (let* ((calc-buffer (current-buffer))
-	 (blink-paren-hook 'calcAlg-blink-matching-open)
+	 (blink-paren-function 'calcAlg-blink-matching-open)
 	 (alg-exp 'error))
     (if (boundp 'calc-alg-ent-map)
 	()
 	     (if (buffer-name (aref calc-embedded-info 0))
 		 (save-excursion
 		   (set-buffer (aref calc-embedded-info 0))
-		   (or (y-or-n-p "Cancel Calc Embedded mode in buffer %s? "
-				 (buffer-name))
+		   (or (y-or-n-p
+			(format "Cancel Calc Embedded mode in buffer %s? "
+				(buffer-name)))
 		       (keyboard-quit))
 		   (calc-embedded nil)))
 	     (calc-embedded arg end obeg oend)))
 	  (error (nth 2 (aref info 8)))))
     (calc-wrapper
      (setq str (math-showing-full-precision
-		(math-format-nice-expr (aref info 8) (screen-width))))
+		(math-format-nice-expr (aref info 8) (frame-width))))
      (calc-edit-mode (list 'calc-embedded-finish-edit info))
      (insert str "\n")))
   (calc-show-edit-buffer)
 				  "dumb" "postscript")))))
 	 (if (equal device "dumb")
 	     (setq device (format "dumb %d %d"
-				  (1- (screen-width)) (1- (screen-height)))))
+				  (1- (frame-width)) (1- (frame-height)))))
 	 (if (equal device "big")
 	     (setq device (format "dumb %d %d"
-				  (* 4 (- (screen-width) 3))
-				  (* 4 (- (screen-height) 3)))))
+				  (* 4 (- (frame-width) 3))
+				  (* 4 (- (frame-height) 3)))))
 	 (if (stringp output)
 	     (if (or (equal output "auto")
 		     (and (equal output "tty") (setq tty-output t)))
 	      (set-window-buffer win buf)
 	    (if (eq major-mode 'calc-mode)
 		(if (or need
-			(< (window-height) (1- (screen-height))))
+			(< (window-height) (1- (frame-height))))
 		    (display-buffer buf))
 	      (switch-to-buffer buf)))))
     (save-excursion
 \(setq load-path (nconc load-path (list \"" (directory-file-name home) "\")))
 \(global-set-key \"\\e#\" 'calc-dispatch)
 ;;; End of Calc autoloads.\n")
-  (let ((trim-versions-without-asking t))
+  (let ((delete-old-versions t))
     (save-buffer))
 )
 
     (if cwin
 	(setq calc-full-mode
 	      (if kwin
-		  (and twin (eq (window-width twin) (screen-width)))
-		(eq (window-height cwin) (1- (screen-height))))))
+		  (and twin (eq (window-width twin) (frame-width)))
+		(eq (window-height cwin) (1- (frame-height))))))
     (setq calc-full-mode (if arg
 			     (> (prefix-numeric-value arg) 0)
 			   (not calc-full-mode)))
 
 
 (defun math-do-working (msg arg)
-  (or executing-macro
+  (or executing-kbd-macro
       (progn
 	(calc-set-command-flag 'clear-message)
 	(if math-working-step
      (run-hooks 'calc-mode-save-hook)
      (insert ";;; End of mode settings\n")
      (if quiet
-	 (let ((executing-macro ""))   ; what a kludge!
+	 (let ((executing-kbd-macro ""))   ; what a kludge!
 	   (save-buffer))
        (save-buffer))))
 )
 		    (symbolp (cdr def))
 		    (eq major-mode 'calc-mode))
 	       (progn
-		 (if (and (< (window-width) (screen-width))
+		 (if (and (< (window-width) (frame-width))
 			  calc-display-trail)
 		     (let ((win (get-buffer-window (calc-trail-buffer))))
 		       (if win
 		      (if (>= (prog2 (forward-char -1)
 				     (current-column)
 				     (forward-char 1))
-			      (screen-width))
+			      (frame-width))
 			  (fill-region top (point))))
 		  (insert "Press C-q to quote control characters like RET"
 			  " and TAB.\n"
 		      (calc-edit-mode (list 'calc-finish-formula-edit
 					    (list 'quote func)))
 		      (insert (math-showing-full-precision
-			       (math-format-nice-expr defn (screen-width)))
+			       (math-format-nice-expr defn (frame-width)))
 			      "\n"))
 		     (calc-show-edit-buffer))
 		 (error "That command's definition cannot be edited"))))))
 	 (open last-command-char)
 	 (counter initial)
 	 ch)
-    (or executing-macro
+    (or executing-kbd-macro
 	(message "Reading loop body..."))
     (while (>= count 0)
       (setq ch (read-char))
 	(setq body (concat body (char-to-string ch)))))
     (if (/= ch (cdr (assq open '( (?\< . ?\>) (?\( . ?\)) (?\{ . ?\}) ))))
 	(error "Mismatched Z%c and Z%c in keyboard macro" open ch))
-    (or executing-macro
+    (or executing-kbd-macro
 	(message "Looping..."))
     (setq body (concat (substring body 0 -2) "Z]"))
-    (and (not executing-macro)
+    (and (not executing-kbd-macro)
 	 (= rpt-count 1000000)
 	 (null parts)
 	 (null counter)
 		     (calc-pop-stack 1)
 		     (setq counter (calcFunc-add counter step)))
 		 (setq rpt-count (1- rpt-count))))))))
-    (or executing-macro
+    (or executing-kbd-macro
 	(message "Looping...done")))
 )
 
 	  (count 0)
 	  (body "")
 	  ch)
-     (if (or executing-macro defining-kbd-macro)
+     (if (or executing-kbd-macro defining-kbd-macro)
 	 (progn
 	   (if defining-kbd-macro
 	       (message "Reading body..."))
 (defun calc-kbd-report (msg)
   (interactive "sMessage: ")
   (calc-wrapper
-   (let ((executing-macro nil)
+   (let ((executing-kbd-macro nil)
 	 (defining-kbd-macro nil))
      (math-working msg (calc-top-n 1))))
 )
 (defun calc-kbd-query (msg)
   (interactive "sPrompt: ")
   (calc-wrapper
-   (let ((executing-macro nil)
+   (let ((executing-kbd-macro nil)
 	 (defining-kbd-macro nil))
      (calc-alg-entry nil (and (not (equal msg "")) msg))))
 )
 	  (sel (or (calc-auto-selection entry) expr))
 	  alg)
      (let ((str (math-showing-full-precision
-		 (math-format-nice-expr sel (screen-width)))))
+		 (math-format-nice-expr sel (frame-width)))))
        (calc-edit-mode (list 'calc-finish-selection-edit
 			     num (list 'quote sel) reselect))
        (insert str "\n"))))
 			 t
 			 (concat "Editing " (calc-var-name var)))
 	 (and value
-	      (insert (math-format-nice-expr value (screen-width)) "\n")))))
+	      (insert (math-format-nice-expr value (frame-width)) "\n")))))
   (calc-show-edit-buffer)
 )
 (setq calc-last-edited-variable nil)
 			   (function
 			    (lambda (x)
 			      (if (math-vectorp x) (setq allow-ret t))
-			      (math-format-nice-expr x (screen-width)))))
+			      (math-format-nice-expr x (frame-width)))))
 			 (if (> n 0)
 			     (calc-top-list n)
 			   (calc-top-list 1 (- n)))))))
 	   (select-window (get-buffer-window (aref calc-embedded-info 1))))
       (switch-to-buffer (get-buffer-create "*Calc Edit*")))
     (setq calc-return-buffer buf)
-    (if (and (< (window-width) (screen-width))
+    (if (and (< (window-width) (frame-width))
 	     calc-display-trail)
 	(let ((win (get-buffer-window (calc-trail-buffer))))
 	  (if win
 	(save-excursion
 	  (set-buffer (calc-trail-buffer))
 	  (and calc-display-trail
-	       (= (window-width) (screen-width))
+	       (= (window-width) (frame-width))
 	       (calc-trail-display 1 t)))
 	(message "Welcome to the GNU Emacs Calculator!  Press `?' or `h' for help, `q' to quit.")
 	(run-hooks 'calc-start-hook)
 	      (kbuf (get-buffer "*Calc Keypad*")))
 	  (delete-windows-on (calc-trail-buffer))
 	  (if (and win
-		   (< (window-height win) (1- (screen-height)))
-		   (= (window-width win) (screen-width))  ; avoid calc-keypad
+		   (< (window-height win) (1- (frame-height)))
+		   (= (window-width win) (frame-width))  ; avoid calc-keypad
 		   (not (get-buffer-window "*Calc Keypad*")))
 	      (setq calc-window-height (- (window-height win) 2)))
 	  (if calc-was-split
 (defun calc-window-width ()
   (if calc-embedded-info
       (let ((win (get-buffer-window (aref calc-embedded-info 0))))
-	(1- (if win (window-width win) (screen-width))))
+	(1- (if win (window-width win) (frame-width))))
     (- (window-width (get-buffer-window (current-buffer)))
        (if calc-line-numbering 5 1)))
 )
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.