From 4add8580fb456ebd6473217ea0df47a393dce4db Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 24 Aug 2005 15:56:02 +0000 Subject: [PATCH] (icon-edit, *mouse-window*, *mouse-x*, *mouse-y*, menu, char): Defvar at compile time. (sc::menu): Declare it before use. (sc::pack-one-line): Use `let', not `let*'. --- lisp/ChangeLog | 26 +++++++++++++++++++++++--- lisp/obsolete/sun-curs.el | 19 +++++++++++++------ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 36352a189c3..f3375f339b2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2005-08-24 Juanma Barranquero + * emerge.el (merge-begin, merge-end, template, A-begin, A-end) + (B-begin, B-end, diff, diff-vector, valid-diff): Defvar at compile + time to silence the byte-compiler. + * ibuffer.el (ibuffer-compile-make-eliding-form) (ibuffer-check-formats): Use `with-no-warnings' to hide references to `ibuffer-elide-long-columns' (which is defined on ibuffer.el, @@ -15,9 +19,25 @@ (ibuffer-cached-formats, ibuffer-cached-elide-long-columns): Declare them before use. - * emerge.el (merge-begin, merge-end, template, A-begin, A-end) - (B-begin, B-end, diff, diff-vector, valid-diff): Defvar at compile - time to silence the byte-compiler. + * info-xref.el (info-xref-xfile-alist, info-xref-filename-heading) + (info-xref-good, info-xref-bad): Defvar at compile time. + + * obsolete/mlsupport.el (filter-region, execute-monitor-command): + Use `let*' instead of `let'. + + * obsolete/sun-curs.el (icon-edit, *mouse-window*, *mouse-x*) + (*mouse-y*, menu, char): Defvar at compile time. + (sc::menu): Declare it before use. + (sc::pack-one-line): Use `let', not `let*'. + + * obsolete/swedish.el (news-inews-hook, news-group-hook-alist) + (mail-send-hook): Defvar at compile time. + + * term/bg-mouse.el (bg-mouse-x, bg-mouse-y, bg-cursor-window): + Defvar at compile time. + + * term/sun-mouse.el (current-global-mousemap) + (current-local-mousemap): Declare them before use. 2005-08-24 Carsten Dominik diff --git a/lisp/obsolete/sun-curs.el b/lisp/obsolete/sun-curs.el index 99cba421350..de372fe6836 100644 --- a/lisp/obsolete/sun-curs.el +++ b/lisp/obsolete/sun-curs.el @@ -32,7 +32,12 @@ ;;; ;;; 9-dec-86 Jeff Peck, Sun Microsystems Inc. -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl) + (defvar *edit-icon*) (defvar char) + ;; These are from term/sun-mouse.el + (defvar *mouse-window*) (defvar *mouse-x*) (defvar *mouse-y*) (defvar menu)) + (require 'sun-fns) (eval-and-compile @@ -79,9 +84,11 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" (if (symbolp icon) (setq icon (symbol-value icon))) (sun-change-cursor-icon icon)) +;; This does not make much sense... (make-local-variable '*edit-icon*) + +(defvar icon-edit nil) (make-variable-buffer-local 'icon-edit) -(setq-default icon-edit nil) (or (assq 'icon-edit minor-mode-alist) (push '(icon-edit " IconEdit") minor-mode-alist)) @@ -109,9 +116,6 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" (insert char) (sc::goto-hotspot)) -(defun sc::menu-function (window x y) - (sun-menu-evaluate window (1+ x) y sc::menu)) - (defmenu sc::menu ("Cursor Menu") ("Pack & Use" sc::pack-buffer-to-cursor) @@ -127,6 +131,9 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" ("Quit" sc::quit-edit) ) +(defun sc::menu-function (window x y) + (sun-menu-evaluate window (1+ x) y sc::menu)) + (defun sc::quit-edit () (interactive) (bury-buffer (current-buffer)) @@ -202,7 +209,7 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" ) (defun sc::pack-one-line (dummy) - (let* (char chr1 chr2) + (let (char chr1 chr2) (setq char 0 chr1 (mapconcat 'sc::pack-one-char "12345678" "") chr1 char) (setq char 0 chr2 (mapconcat 'sc::pack-one-char "12345678" "") chr2 char) (forward-line 1) -- 2.39.2