From f2cb69d5a862556898ef3486fcd62a7d535f72d5 Mon Sep 17 00:00:00 2001 From: David Ponce Date: Mon, 4 Jul 2005 12:33:21 +0000 Subject: Improve header Commentary section. (tree-widget) [defgroup] (tree-widget-image-enable, tree-widget-themes-directory) (tree-widget-theme, tree-widget-image-properties-emacs) (tree-widget-image-properties-xemacs, tree-widget-create-image) (tree-widget-image-formats, tree-widget-control) (tree-widget-empty-control, tree-widget-leaf-control (tree-widget-guide, tree-widget-end-guide, tree-widget-no-guide) (tree-widget-handle, tree-widget-no-handle, tree-widget-p) (tree-widget-keep, tree-widget-after-toggle-functions) (tree-widget-open-node, tree-widget-close-node): Doc fix. (tree-widget-open-control, tree-widget-close-control): Fix doc and :help-echo message. (tree-widget-set-theme): Doc fix. Use `string-equal'. (tree-widget-image-properties): Doc fix. Clearer implementation. (tree-widget--cursors): New constant. (tree-widget-lookup-image): New function split from `tree-widget-find-image'. Clearer implementation. (tree-widget-find-image): Use it. (tree-widget-button-keymap): Use `set-keymap-parent'. (tree-widget) [define-widget]: Use `widget-children-value-delete'. Define the sub-widgets here. (tree-widget-node): Check that :node is not a tree-widget. (tree-widget-get-super, tree-widget-open-control) (tree-widget-close-control, tree-widget-empty-control) (tree-widget-leaf-control, tree-widget-guide) (tree-widget-end-guide, tree-widget-no-guide, tree-widget-handle) (tree-widget-no-handle, tree-widget-value-delete) (tree-widget-map): Remove. (tree-widget-children-value-save): Doc fix. Simplified. (tree-widget-value-create): Update according to previous changes. --- lisp/tree-widget.el | 635 ++++++++++++++++++++++++---------------------------- 1 file changed, 293 insertions(+), 342 deletions(-) (limited to 'lisp/tree-widget.el') diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el index 93b466194a1..76d89afca87 100644 --- a/lisp/tree-widget.el +++ b/lisp/tree-widget.el @@ -31,75 +31,70 @@ ;; ;; The following properties are specific to the tree widget: ;; -;; :open -;; Set to non-nil to unfold the tree. By default the tree is -;; folded. +;; :open +;; Set to non-nil to expand the tree. By default the tree is +;; collapsed. ;; -;; :node -;; Specify the widget used to represent a tree node. By default -;; this is an `item' widget which displays the tree-widget :tag -;; property value if defined or a string representation of the -;; tree-widget value. +;; :node +;; Specify the widget used to represent the value of a tree node. +;; By default this is an `item' widget which displays the +;; tree-widget :tag property value if defined, or a string +;; representation of the tree-widget value. ;; -;; :keep -;; Specify a list of properties to keep when the tree is -;; folded so they can be recovered when the tree is unfolded. -;; This property can be used in child widgets too. +;; :keep +;; Specify a list of properties to keep when the tree is collapsed +;; so they can be recovered when the tree is expanded. This +;; property can be used in child widgets too. ;; -;; :dynargs -;; Specify a function to be called when the tree is unfolded, to -;; dynamically provide the tree children in response to an unfold -;; request. This function will be passed the tree widget and -;; must return a list of child widgets. That list will be stored -;; as the :args property of the parent tree. - -;; To speed up successive unfold requests, the :dynargs function -;; can directly return the :args value if non-nil. Refreshing -;; child values can be achieved by giving the :args property the -;; value nil, then redrawing the tree. +;; :expander (obsoletes :dynargs) +;; Specify a function to be called to dynamically provide the +;; tree's children in response to an expand request. This function +;; will be passed the tree widget and must return a list of child +;; widgets. ;; -;; :has-children -;; Specify if this tree has children. This property has meaning -;; only when used with the above :dynargs one. It indicates that -;; child widgets exist but will be dynamically provided when -;; unfolding the node. +;; *Please note:* Child widgets returned by the :expander function +;; are stored in the :args property of the tree widget. To speed +;; up successive expand requests, the :expander function is not +;; called again when the :args value is non-nil. To refresh child +;; values, it is necessary to set the :args property to nil, then +;; redraw the tree. ;; -;; :open-control (default `tree-widget-open-control') -;; :close-control (default `tree-widget-close-control') -;; :empty-control (default `tree-widget-empty-control') -;; :leaf-control (default `tree-widget-leaf-control') -;; :guide (default `tree-widget-guide') -;; :end-guide (default `tree-widget-end-guide') -;; :no-guide (default `tree-widget-no-guide') -;; :handle (default `tree-widget-handle') -;; :no-handle (default `tree-widget-no-handle') +;; :open-control (default `tree-widget-open-control') +;; :close-control (default `tree-widget-close-control') +;; :empty-control (default `tree-widget-empty-control') +;; :leaf-control (default `tree-widget-leaf-control') +;; :guide (default `tree-widget-guide') +;; :end-guide (default `tree-widget-end-guide') +;; :no-guide (default `tree-widget-no-guide') +;; :handle (default `tree-widget-handle') +;; :no-handle (default `tree-widget-no-handle') +;; Those properties define the widgets used to draw the tree, and +;; permit to customize its look and feel. For example, using +;; `item' widgets with these :tag values: ;; -;; The above nine properties define the widgets used to draw the tree. -;; For example, using widgets that display this values: +;; open-control "[-] " (OC) +;; close-control "[+] " (CC) +;; empty-control "[X] " (EC) +;; leaf-control "[>] " (LC) +;; guide " |" (GU) +;; noguide " " (NG) +;; end-guide " `" (EG) +;; handle "-" (HA) +;; no-handle " " (NH) ;; -;; open-control "[-] " -;; close-control "[+] " -;; empty-control "[X] " -;; leaf-control "[>] " -;; guide " |" -;; noguide " " -;; end-guide " `" -;; handle "-" -;; no-handle " " +;; A tree will look like this: ;; -;; A tree will look like this: -;; -;; [-] 1 open-control -;; |-[+] 1.0 guide+handle+close-control -;; |-[X] 1.1 guide+handle+empty-control -;; `-[-] 1.2 end-guide+handle+open-control -;; |-[>] 1.2.1 no-guide+no-handle+guide+handle+leaf-control -;; `-[>] 1.2.2 no-guide+no-handle+end-guide+handle+leaf-control -;; -;; By default, the tree widget try to use images instead of strings to -;; draw a nice-looking tree. See the `tree-widget-themes-directory' -;; and `tree-widget-theme' options for more details. +;; [-] 1 (OC :node) +;; |-[+] 1.0 (GU+HA+CC :node) +;; |-[X] 1.1 (GU+HA+EC :node) +;; `-[-] 1.2 (EG+HA+OC :node) +;; |-[>] 1.2.1 (NG+NH+GU+HA+LC child) +;; `-[>] 1.2.2 (NG+NH+EG+HA+LC child) ;; +;; By default, images will be used instead of strings to draw a +;; nice-looking tree. See the `tree-widget-image-enable', +;; `tree-widget-themes-directory', and `tree-widget-theme' options for +;; more details. ;;; History: ;; @@ -111,70 +106,75 @@ ;;; Customization ;; (defgroup tree-widget nil - "Customization support for the Tree Widget Library." + "Customization support for the Tree Widget library." :version "22.1" :group 'widgets) (defcustom tree-widget-image-enable (not (or (featurep 'xemacs) (< emacs-major-version 21))) - "*non-nil means that tree-widget will try to use images." + "*Non-nil means that tree-widget will try to use images." :type 'boolean :group 'tree-widget) (defcustom tree-widget-themes-directory "tree-widget" - "*Name of the directory where to lookup for image themes. + "*Name of the directory where to look up for image themes. When nil use the directory where the tree-widget library is located. -When a relative name is specified, try to locate that sub-directory in +When a relative name is specified, try to locate that sub directory in `load-path', then in the data directory, and use the first one found. -Default is to search for a \"tree-widget\" sub-directory. - -The data directory is the value of: - - the variable `data-directory' on GNU Emacs; - - `(locate-data-directory \"tree-widget\")' on XEmacs." +The data directory is the value of the variable `data-directory' on +Emacs, and what `(locate-data-directory \"tree-widget\")' returns on +XEmacs. +The default is to use the \"tree-widget\" relative name." :type '(choice (const :tag "Default" "tree-widget") (const :tag "With the library" nil) (directory :format "%{%t%}:\n%v")) :group 'tree-widget) (defcustom tree-widget-theme nil - "*Name of the theme to use to lookup for images. -The theme name must be a subdirectory in `tree-widget-themes-directory'. -If nil use the \"default\" theme. -When a image is not found in the current theme, the \"default\" theme -is searched too. -A complete theme should contain images with these file names: - -Name Represents ------------ ------------------------------------------------ -open opened node (for example an open folder) -close closed node (for example a close folder) -empty empty node (a node without children) -leaf leaf node (for example a document) -guide a vertical guide line -no-guide an invisible guide line -end-guide the end of a vertical guide line -handle an horizontal line drawn before a node control -no-handle an invisible handle ------------ ------------------------------------------------" + "*Name of the theme where to look up for images. +It must be a sub directory of the directory specified in variable +`tree-widget-themes-directory'. The default is \"default\". When an +image is not found in this theme, the default theme is searched too. +A complete theme must contain images with these file names with a +supported extension (see also `tree-widget-image-formats'): + +\"open\" + Represent an expanded node. +\"close\" + Represent a collapsed node. +\"empty\" + Represent an expanded node with no child. +\"leaf\" + Represent a leaf node. +\"guide\" + A vertical guide line. +\"no-guide\" + An invisible vertical guide line. +\"end-guide\" + End of a vertical guide line. +\"handle\" + Horizontal guide line that joins the vertical guide line to a node. +\"no-handle\" + An invisible handle." :type '(choice (const :tag "Default" nil) (string :tag "Name")) :group 'tree-widget) (defcustom tree-widget-image-properties-emacs '(:ascent center :mask (heuristic t)) - "*Properties of GNU Emacs images." + "*Default properties of Emacs images." :type 'plist :group 'tree-widget) (defcustom tree-widget-image-properties-xemacs nil - "*Properties of XEmacs images." + "*Default properties of XEmacs images." :type 'plist :group 'tree-widget) ;;; Image support ;; -(eval-and-compile ;; GNU Emacs/XEmacs compatibility stuff +(eval-and-compile ;; Emacs/XEmacs compatibility stuff (cond ;; XEmacs ((featurep 'xemacs) @@ -184,12 +184,11 @@ no-handle an invisible handle widget-glyph-enable (console-on-window-system-p))) (defsubst tree-widget-create-image (type file &optional props) - "Create an image of type TYPE from FILE. -Give the image the specified properties PROPS. -Return the new image." + "Create an image of type TYPE from FILE, and return it. +Give the image the specified properties PROPS." (apply 'make-glyph `([,type :file ,file ,@props]))) (defsubst tree-widget-image-formats () - "Return the list of image formats, file name suffixes associations. + "Return the alist of image formats/file name extensions. See also the option `widget-image-file-name-suffixes'." (delq nil (mapcar @@ -197,7 +196,7 @@ See also the option `widget-image-file-name-suffixes'." (and (valid-image-instantiator-format-p (car fmt)) fmt)) widget-image-file-name-suffixes))) ) - ;; GNU Emacs + ;; Emacs (t (defsubst tree-widget-use-image-p () "Return non-nil if image support is currently enabled." @@ -205,13 +204,12 @@ See also the option `widget-image-file-name-suffixes'." widget-image-enable (display-images-p))) (defsubst tree-widget-create-image (type file &optional props) - "Create an image of type TYPE from FILE. -Give the image the specified properties PROPS. -Return the new image." + "Create an image of type TYPE from FILE, and return it. +Give the image the specified properties PROPS." (apply 'create-image `(,file ,type nil ,@props))) (defsubst tree-widget-image-formats () - "Return the list of image formats, file name suffixes associations. -See also the option `widget-image-conversion'." + "Return the alist of image formats/file name extensions. +See also the option `widget-image-file-name-suffixes'." (delq nil (mapcar #'(lambda (fmt) @@ -229,12 +227,12 @@ See also the option `widget-image-conversion'." (defsubst tree-widget-set-theme (&optional name) "In the current buffer, set the theme to use for images. -The current buffer should be where the tree widget is drawn. -Optional argument NAME is the name of the theme to use, which defaults +The current buffer must be where the tree widget is drawn. +Optional argument NAME is the name of the theme to use. It defaults to the value of the variable `tree-widget-theme'. -Does nothing if NAME is the name of the current theme." +Does nothing if NAME is already the current theme." (or name (setq name (or tree-widget-theme "default"))) - (unless (equal name (tree-widget-theme-name)) + (unless (string-equal name (tree-widget-theme-name)) (set (make-local-variable 'tree-widget--theme) (make-vector 4 nil)) (aset tree-widget--theme 0 name))) @@ -265,10 +263,10 @@ specified directory is not accessible." (t (let ((path (append load-path - ;; The data directory depends on which, GNU - ;; Emacs or XEmacs, is running. (list (if (fboundp 'locate-data-directory) + ;; XEmacs (locate-data-directory "tree-widget") + ;; Emacs data-directory))))) (while (and path (not found)) (when (car path) @@ -286,10 +284,12 @@ specified directory is not accessible." (aset tree-widget--theme 2 props)) (defun tree-widget-image-properties (file) - "Return properties of images in current theme. -If the \"tree-widget-theme-setup.el\" file exists in the directory -where is located the image FILE, load it to setup theme images -properties. Typically that file should contain something like this: + "Return the properties of an image in current theme. +FILE is the absolute file name of an image. + +If there is a \"tree-widget-theme-setup\" library in the theme +directory, where is located FILE, load it to setup theme images +properties. Typically it should contain something like this: (tree-widget-set-image-properties (if (featurep 'xemacs) @@ -297,148 +297,170 @@ properties. Typically that file should contain something like this: '(:ascent center :mask (heuristic t)) )) -By default, use the global properties provided in variables -`tree-widget-image-properties-emacs' or +Default global properties are provided for respectively Emacs and +XEmacs in the variables `tree-widget-image-properties-emacs', and `tree-widget-image-properties-xemacs'." ;; If properties are in the cache, use them. - (or (aref tree-widget--theme 2) - (progn - ;; Load tree-widget-theme-setup if available. - (load (expand-file-name - "tree-widget-theme-setup" - (file-name-directory file)) t t) - ;; If properties have been setup, use them. - (or (aref tree-widget--theme 2) - ;; By default, use supplied global properties. - (tree-widget-set-image-properties - (if (featurep 'xemacs) - tree-widget-image-properties-xemacs - tree-widget-image-properties-emacs)))))) + (let ((plist (aref tree-widget--theme 2))) + (unless plist + ;; Load tree-widget-theme-setup if available. + (load (expand-file-name "tree-widget-theme-setup" + (file-name-directory file)) t t) + ;; If properties have been setup, use them. + (unless (setq plist (aref tree-widget--theme 2)) + ;; By default, use supplied global properties. + (setq plist (if (featurep 'xemacs) + tree-widget-image-properties-xemacs + tree-widget-image-properties-emacs)) + ;; Setup the cache. + (tree-widget-set-image-properties plist))) + plist)) + +(defconst tree-widget--cursors + ;; Pointer shapes when the mouse pointer is over tree-widget images. + ;; This feature works since Emacs 22, and ignored on older versions, + ;; and XEmacs. + '( + ("open" . hand ) + ("close" . hand ) + ("empty" . arrow) + ("leaf" . arrow) + ("guide" . arrow) + ("no-guide" . arrow) + ("end-guide" . arrow) + ("handle" . arrow) + ("no-handle" . arrow) + )) + +(defun tree-widget-lookup-image (name) + "Look up in current theme for an image with NAME. +Search first in current theme, then in default theme (see also the +variable `tree-widget-theme'). +Return the first image found having a supported format, or nil if not +found." + (let ((default-directory (tree-widget-themes-directory))) + (when default-directory + (let (file (theme (tree-widget-theme-name))) + (catch 'found + (dolist (dir (if (string-equal theme "default") + '("default") (list theme "default"))) + (dolist (fmt (tree-widget-image-formats)) + (dolist (ext (cdr fmt)) + (setq file (expand-file-name (concat name ext) dir)) + (and + (file-readable-p file) + (file-regular-p file) + (throw + 'found + (tree-widget-create-image + (car fmt) file + ;; Add the pointer shape + (cons :pointer + (cons + (cdr (assoc name tree-widget--cursors)) + (tree-widget-image-properties file))))))))) + nil))))) (defun tree-widget-find-image (name) "Find the image with NAME in current theme. NAME is an image file name sans extension. -Search first in current theme, then in default theme. -A theme is a sub-directory of the root theme directory specified in -variable `tree-widget-themes-directory'. -Return the first image found having a supported format in those -returned by the function `tree-widget-image-formats', or nil if not -found." +Return the image found, or nil if not found." (when (tree-widget-use-image-p) ;; Ensure there is an active theme. (tree-widget-set-theme (tree-widget-theme-name)) - ;; If the image is in the cache, return it. - (or (cdr (assoc name (aref tree-widget--theme 3))) - ;; Search the image in the current, then default themes. - (let ((default-directory (tree-widget-themes-directory))) - (when default-directory - (let* ((theme (tree-widget-theme-name)) - (path (mapcar 'expand-file-name - (if (equal theme "default") - '("default") - (list theme "default")))) - (formats (tree-widget-image-formats)) - (found - (catch 'found - (dolist (dir path) - (dolist (fmt formats) - (dolist (ext (cdr fmt)) - (let ((file (expand-file-name - (concat name ext) dir))) - (and (file-readable-p file) - (file-regular-p file) - (throw 'found - (cons (car fmt) file))))))) - nil))) - (when found - (let ((image - (tree-widget-create-image - (car found) (cdr found) - (tree-widget-image-properties (cdr found))))) - ;; Store image in the cache for later use. - (push (cons name image) (aref tree-widget--theme 3)) - image)))))))) + (let ((image (assoc name (aref tree-widget--theme 3)))) + ;; The image NAME is found in the cache. + (if image + (cdr image) + ;; Search the image in current, and default themes. + (prog1 + (setq image (tree-widget-lookup-image name)) + ;; Store image reference in the cache for later use. + (push (cons name image) (aref tree-widget--theme 3)))) + ))) ;;; Widgets ;; (defvar tree-widget-button-keymap - (let (parent-keymap mouse-button1 keymap) - (if (featurep 'xemacs) - (setq parent-keymap widget-button-keymap - mouse-button1 [button1]) - (setq parent-keymap widget-keymap - mouse-button1 [down-mouse-1])) - (setq keymap (copy-keymap parent-keymap)) - (define-key keymap mouse-button1 'widget-button-click) - keymap) - "Keymap used inside node handle buttons.") + (let ((km (make-sparse-keymap))) + (if (boundp 'widget-button-keymap) + ;; XEmacs + (progn + (set-keymap-parent km widget-button-keymap) + (define-key km [button1] 'widget-button-click)) + ;; Emacs + (set-keymap-parent km widget-keymap) + (define-key km [down-mouse-1] 'widget-button-click)) + km) + "Keymap used inside node buttons. +Handle mouse button 1 click on buttons.") (define-widget 'tree-widget-control 'push-button - "Base `tree-widget' control." + "Basic widget other tree-widget node buttons are derived from." :format "%[%t%]" :button-keymap tree-widget-button-keymap ; XEmacs :keymap tree-widget-button-keymap ; Emacs ) (define-widget 'tree-widget-open-control 'tree-widget-control - "Control widget that represents a opened `tree-widget' node." + "Button for an expanded tree-widget node." :tag "[-] " ;;:tag-glyph (tree-widget-find-image "open") :notify 'tree-widget-close-node - :help-echo "Hide node" + :help-echo "Collapse node" ) (define-widget 'tree-widget-empty-control 'tree-widget-open-control - "Control widget that represents an empty opened `tree-widget' node." + "Button for an expanded tree-widget node with no child." :tag "[X] " ;;:tag-glyph (tree-widget-find-image "empty") ) (define-widget 'tree-widget-close-control 'tree-widget-control - "Control widget that represents a closed `tree-widget' node." + "Button for a collapsed tree-widget node." :tag "[+] " ;;:tag-glyph (tree-widget-find-image "close") :notify 'tree-widget-open-node - :help-echo "Show node" + :help-echo "Expand node" ) (define-widget 'tree-widget-leaf-control 'item - "Control widget that represents a leaf node." - :tag " " ;; Need at least a char to display the image :-( + "Representation of a tree-widget leaf node." + :tag " " ;; Need at least one char to display the image :-( ;;:tag-glyph (tree-widget-find-image "leaf") :format "%t" ) (define-widget 'tree-widget-guide 'item - "Widget that represents a guide line." + "Vertical guide line." :tag " |" ;;:tag-glyph (tree-widget-find-image "guide") :format "%t" ) (define-widget 'tree-widget-end-guide 'item - "Widget that represents the end of a guide line." + "End of a vertical guide line." :tag " `" ;;:tag-glyph (tree-widget-find-image "end-guide") :format "%t" ) (define-widget 'tree-widget-no-guide 'item - "Widget that represents an invisible guide line." + "Invisible vertical guide line." :tag " " ;;:tag-glyph (tree-widget-find-image "no-guide") :format "%t" ) (define-widget 'tree-widget-handle 'item - "Widget that represent a node handle." + "Horizontal guide line that joins a vertical guide line to a node." :tag " " ;;:tag-glyph (tree-widget-find-image "handle") :format "%t" ) (define-widget 'tree-widget-no-handle 'item - "Widget that represent an invisible node handle." + "Invisible handle." :tag " " ;;:tag-glyph (tree-widget-find-image "no-handle") :format "%t" @@ -449,96 +471,60 @@ found." :format "%v" :convert-widget 'widget-types-convert-widget :value-get 'widget-value-value-get + :value-delete 'widget-children-value-delete :value-create 'tree-widget-value-create - :value-delete 'tree-widget-value-delete + :open-control 'tree-widget-open-control + :close-control 'tree-widget-close-control + :empty-control 'tree-widget-empty-control + :leaf-control 'tree-widget-leaf-control + :guide 'tree-widget-guide + :end-guide 'tree-widget-end-guide + :no-guide 'tree-widget-no-guide + :handle 'tree-widget-handle + :no-handle 'tree-widget-no-handle ) ;;; Widget support functions ;; (defun tree-widget-p (widget) - "Return non-nil if WIDGET is a `tree-widget' widget." + "Return non-nil if WIDGET is a tree-widget." (let ((type (widget-type widget))) (while (and type (not (eq type 'tree-widget))) (setq type (widget-type (get type 'widget-type)))) (eq type 'tree-widget))) -(defsubst tree-widget-get-super (widget property) - "Return WIDGET's inherited PROPERTY value." - (widget-get (get (widget-type (get (widget-type widget) - 'widget-type)) - 'widget-type) - property)) - -(defsubst tree-widget-node (widget) - "Return the tree WIDGET :node value. -If not found setup a default 'item' widget." +(defun tree-widget-node (widget) + "Return WIDGET's :node child widget. +If not found, setup an `item' widget as default. +Signal an error if the :node widget is a tree-widget. +WIDGET is, or derives from, a tree-widget." (let ((node (widget-get widget :node))) - (unless node + (if node + ;; Check that the :node widget is not a tree-widget. + (and (tree-widget-p node) + (error "Invalid tree-widget :node %S" node)) + ;; Setup an item widget as default :node. (setq node `(item :tag ,(or (widget-get widget :tag) (widget-princ-to-string (widget-value widget))))) (widget-put widget :node node)) node)) -(defsubst tree-widget-open-control (widget) - "Return the opened node control specified in WIDGET." - (or (widget-get widget :open-control) - 'tree-widget-open-control)) - -(defsubst tree-widget-close-control (widget) - "Return the closed node control specified in WIDGET." - (or (widget-get widget :close-control) - 'tree-widget-close-control)) - -(defsubst tree-widget-empty-control (widget) - "Return the empty node control specified in WIDGET." - (or (widget-get widget :empty-control) - 'tree-widget-empty-control)) - -(defsubst tree-widget-leaf-control (widget) - "Return the leaf node control specified in WIDGET." - (or (widget-get widget :leaf-control) - 'tree-widget-leaf-control)) - -(defsubst tree-widget-guide (widget) - "Return the guide line widget specified in WIDGET." - (or (widget-get widget :guide) - 'tree-widget-guide)) - -(defsubst tree-widget-end-guide (widget) - "Return the end of guide line widget specified in WIDGET." - (or (widget-get widget :end-guide) - 'tree-widget-end-guide)) - -(defsubst tree-widget-no-guide (widget) - "Return the invisible guide line widget specified in WIDGET." - (or (widget-get widget :no-guide) - 'tree-widget-no-guide)) - -(defsubst tree-widget-handle (widget) - "Return the node handle line widget specified in WIDGET." - (or (widget-get widget :handle) - 'tree-widget-handle)) - -(defsubst tree-widget-no-handle (widget) - "Return the node invisible handle line widget specified in WIDGET." - (or (widget-get widget :no-handle) - 'tree-widget-no-handle)) - (defun tree-widget-keep (arg widget) - "Save in ARG the WIDGET properties specified by :keep." + "Save in ARG the WIDGET's properties specified by :keep." (dolist (prop (widget-get widget :keep)) (widget-put arg prop (widget-get widget prop)))) (defun tree-widget-children-value-save (widget &optional args node) "Save WIDGET children values. -Children properties and values are saved in ARGS if non-nil else in -WIDGET :args property value. Data node properties and value are saved -in NODE if non-nil else in WIDGET :node property value." - (let ((args (or args (widget-get widget :args))) - (node (or node (tree-widget-node widget))) - (children (widget-get widget :children)) - (node-child (widget-get widget :tree-widget--node)) +WIDGET is, or derives from, a tree-widget. +Children properties and values are saved in ARGS if non-nil, else in +WIDGET's :args property value. Properties and values of the +WIDGET's :node sub-widget are saved in NODE if non-nil, else in +WIDGET's :node sub-widget." + (let ((args (cons (or node (widget-get widget :node)) + (or args (widget-get widget :args)))) + (children (widget-get widget :children)) arg child) (while (and args children) (setq arg (car args) @@ -550,7 +536,7 @@ in NODE if non-nil else in WIDGET :node property value." (progn ;; Backtrack :args and :node properties. (widget-put arg :args (widget-get child :args)) - (widget-put arg :node (tree-widget-node child)) + (widget-put arg :node (widget-get child :node)) ;; Save :open property. (widget-put arg :open (widget-get child :open)) ;; The node is open. @@ -563,30 +549,22 @@ in NODE if non-nil else in WIDGET :node property value." (tree-widget-children-value-save child (widget-get arg :args) (widget-get arg :node)))) ;;;; Another non tree node. - ;; Save the widget value + ;; Save the widget value. (widget-put arg :value (widget-value child)) ;; Save properties specified in :keep. - (tree-widget-keep arg child))) - (when (and node node-child) - ;; Assume that the node child widget is not a tree! - ;; Save the node child widget value. - (widget-put node :value (widget-value node-child)) - ;; Save the node child properties specified in :keep. - (tree-widget-keep node node-child)) - )) + (tree-widget-keep arg child))))) (defvar tree-widget-after-toggle-functions nil - "Hooks run after toggling a `tree-widget' folding. -Each function will receive the `tree-widget' as its unique argument. -This variable should be local to each buffer used to display -widgets.") + "Hooks run after toggling a tree-widget expansion. +Each function will receive the tree-widget as its unique argument. +This hook should be local in the buffer used to display widgets.") (defun tree-widget-close-node (widget &rest ignore) - "Close the `tree-widget' node associated to this control WIDGET. -WIDGET's parent should be a `tree-widget'. + "Collapse the tree-widget, parent of WIDGET. +WIDGET is, or derives from, a tree-widget-open-control widget. IGNORE other arguments." (let ((tree (widget-get widget :parent))) - ;; Before folding the node up, save children values so next open + ;; Before to collapse the node, save children values so next open ;; can recover them. (tree-widget-children-value-save tree) (widget-put tree :open nil) @@ -594,131 +572,104 @@ IGNORE other arguments." (run-hook-with-args 'tree-widget-after-toggle-functions tree))) (defun tree-widget-open-node (widget &rest ignore) - "Open the `tree-widget' node associated to this control WIDGET. -WIDGET's parent should be a `tree-widget'. + "Expand the tree-widget, parent of WIDGET. +WIDGET is, or derives from, a tree-widget-close-control widget. IGNORE other arguments." (let ((tree (widget-get widget :parent))) (widget-put tree :open t) (widget-value-set tree t) (run-hook-with-args 'tree-widget-after-toggle-functions tree))) -(defun tree-widget-value-delete (widget) - "Delete tree WIDGET children." - ;; Delete children - (widget-children-value-delete widget) - ;; Delete node child - (widget-delete (widget-get widget :tree-widget--node)) - (widget-put widget :tree-widget--node nil)) - (defun tree-widget-value-create (tree) - "Create the TREE widget." - (let* ((widget-image-enable (tree-widget-use-image-p)) ; Emacs - (widget-glyph-enable widget-image-enable) ; XEmacs - (node (tree-widget-node tree)) - (flags (widget-get tree :tree-widget--guide-flags)) + "Create the TREE tree-widget." + (let* ((node (tree-widget-node tree)) + (flags (widget-get tree :tree-widget--guide-flags)) (indent (widget-get tree :indent)) + ;; Setup widget's image support. Looking up for images, and + ;; setting widgets' :tag-glyph is done here, to allow to + ;; dynamically change the image theme. + (widget-image-enable (tree-widget-use-image-p)) ; Emacs + (widget-glyph-enable widget-image-enable) ; XEmacs children buttons) (and indent (not (widget-get tree :parent)) (insert-char ?\ indent)) (if (widget-get tree :open) -;;;; Unfolded node. +;;;; Expanded node. (let ((args (widget-get tree :args)) - (dynargs (widget-get tree :dynargs)) - (guide (tree-widget-guide tree)) - (noguide (tree-widget-no-guide tree)) - (endguide (tree-widget-end-guide tree)) - (handle (tree-widget-handle tree)) - (nohandle (tree-widget-no-handle tree)) - ;; Lookup for images and set widgets' tag-glyphs here, - ;; to allow to dynamically change the image theme. + (xpandr (or (widget-get tree :expander) + (widget-get tree :dynargs))) + (leaf (widget-get tree :leaf-control)) + (guide (widget-get tree :guide)) + (noguide (widget-get tree :no-guide)) + (endguide (widget-get tree :end-guide)) + (handle (widget-get tree :handle)) + (nohandle (widget-get tree :no-handle)) + (leafi (tree-widget-find-image "leaf")) (guidi (tree-widget-find-image "guide")) (noguidi (tree-widget-find-image "no-guide")) (endguidi (tree-widget-find-image "end-guide")) (handli (tree-widget-find-image "handle")) (nohandli (tree-widget-find-image "no-handle")) child) - (when dynargs - ;; Request the definition of dynamic children - (setq dynargs (funcall dynargs tree)) - ;; Unless children have changed, reuse the widgets - (unless (eq args dynargs) - (setq args (mapcar 'widget-convert dynargs)) - (widget-put tree :args args))) - ;; Insert the node control + ;; Request children at run time, when not already done. + (when (and (not args) xpandr) + (setq args (mapcar 'widget-convert (funcall xpandr tree))) + (widget-put tree :args args)) + ;; Insert the node "open" button. (push (widget-create-child-and-convert - tree (if args (tree-widget-open-control tree) - (tree-widget-empty-control tree)) + tree (widget-get + tree (if args :open-control :empty-control)) :tag-glyph (tree-widget-find-image (if args "open" "empty"))) buttons) - ;; Insert the node element - (widget-put tree :tree-widget--node - (widget-create-child-and-convert tree node)) - ;; Insert children + ;; Insert the :node element. + (push (widget-create-child-and-convert tree node) + children) + ;; Insert children. (while args (setq child (car args) args (cdr args)) (and indent (insert-char ?\ indent)) - ;; Insert guide lines elements + ;; Insert guide lines elements from previous levels. (dolist (f (reverse flags)) (widget-create-child-and-convert tree (if f guide noguide) :tag-glyph (if f guidi noguidi)) (widget-create-child-and-convert - tree nohandle :tag-glyph nohandli) - ) + tree nohandle :tag-glyph nohandli)) + ;; Insert guide line element for this level. (widget-create-child-and-convert tree (if args guide endguide) :tag-glyph (if args guidi endguidi)) ;; Insert the node handle line (widget-create-child-and-convert tree handle :tag-glyph handli) - ;; If leaf node, insert a leaf node control + ;; If leaf node, insert a leaf node button. (unless (tree-widget-p child) (push (widget-create-child-and-convert - tree (tree-widget-leaf-control tree) - :tag-glyph (tree-widget-find-image "leaf")) + tree leaf :tag-glyph leafi) buttons)) - ;; Insert the child element + ;; Finally, insert the child widget. (push (widget-create-child-and-convert tree child :tree-widget--guide-flags (cons (if args t) flags)) children))) -;;;; Folded node. - ;; Insert the closed node control +;;;; Collapsed node. + ;; Insert the "closed" node button. (push (widget-create-child-and-convert - tree (tree-widget-close-control tree) + tree (widget-get tree :close-control) :tag-glyph (tree-widget-find-image "close")) buttons) - ;; Insert the node element - (widget-put tree :tree-widget--node - (widget-create-child-and-convert tree node))) - ;; Save widget children and buttons + ;; Insert the :node element. + (push (widget-create-child-and-convert tree node) + children)) + ;; Save widget children and buttons. The :node child is the first + ;; element in children. (widget-put tree :children (nreverse children)) (widget-put tree :buttons buttons) )) - -;;; Utilities -;; -(defun tree-widget-map (widget fun) - "For each WIDGET displayed child call function FUN. -FUN is called with three arguments like this: - - (FUN CHILD IS-NODE WIDGET) - -where: -- - CHILD is the child widget. -- - IS-NODE is non-nil if CHILD is WIDGET node widget." - (when (widget-get widget :tree-widget--node) - (funcall fun (widget-get widget :tree-widget--node) t widget) - (dolist (child (widget-get widget :children)) - (if (tree-widget-p child) - ;; The child is a tree node. - (tree-widget-map child fun) - ;; Another non tree node. - (funcall fun child nil widget))))) (provide 'tree-widget) -;;; arch-tag: c3a1ada2-1663-41dc-9d16-2479ed8320e8 +;; arch-tag: c3a1ada2-1663-41dc-9d16-2479ed8320e8 ;;; tree-widget.el ends here -- cgit v1.2.3 From 086add1519b5c5a69a1a35aadbfd4d7cc6a2b294 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Mon, 4 Jul 2005 23:32:44 +0000 Subject: Update FSF's address. --- configure.in | 4 ++-- etc/cs-refcard.tex | 4 ++-- etc/edt-user.doc | 4 ++-- etc/fr-refcard.tex | 4 ++-- etc/pl-refcard.tex | 4 ++-- etc/refcard.tex | 4 ++-- etc/sk-refcard.tex | 4 ++-- lisp/Makefile.in | 4 ++-- lisp/abbrev.el | 4 ++-- lisp/abbrevlist.el | 4 ++-- lisp/add-log.el | 4 ++-- lisp/align.el | 4 ++-- lisp/allout.el | 4 ++-- lisp/ansi-color.el | 4 ++-- lisp/apropos.el | 4 ++-- lisp/arc-mode.el | 4 ++-- lisp/array.el | 4 ++-- lisp/autoarg.el | 4 ++-- lisp/autoinsert.el | 4 ++-- lisp/autorevert.el | 4 ++-- lisp/avoid.el | 4 ++-- lisp/battery.el | 4 ++-- lisp/bindings.el | 4 ++-- lisp/bookmark.el | 4 ++-- lisp/bs.el | 4 ++-- lisp/buff-menu.el | 4 ++-- lisp/button.el | 4 ++-- lisp/calculator.el | 4 ++-- lisp/case-table.el | 4 ++-- lisp/cdl.el | 4 ++-- lisp/chistory.el | 4 ++-- lisp/cmuscheme.el | 4 ++-- lisp/comint.el | 4 ++-- lisp/compare-w.el | 4 ++-- lisp/complete.el | 4 ++-- lisp/completion.el | 4 ++-- lisp/composite.el | 4 ++-- lisp/cus-dep.el | 4 ++-- lisp/cus-edit.el | 4 ++-- lisp/cus-face.el | 4 ++-- lisp/cus-start.el | 4 ++-- lisp/cus-theme.el | 4 ++-- lisp/custom.el | 4 ++-- lisp/cvs-status.el | 4 ++-- lisp/dabbrev.el | 4 ++-- lisp/delim-col.el | 4 ++-- lisp/delsel.el | 4 ++-- lisp/descr-text.el | 4 ++-- lisp/desktop.el | 4 ++-- lisp/diff-mode.el | 4 ++-- lisp/diff.el | 4 ++-- lisp/dired-aux.el | 4 ++-- lisp/dired-x.el | 4 ++-- lisp/dired.el | 4 ++-- lisp/dirtrack.el | 4 ++-- lisp/disp-table.el | 4 ++-- lisp/dnd.el | 4 ++-- lisp/dos-fns.el | 4 ++-- lisp/dos-vars.el | 4 ++-- lisp/dos-w32.el | 4 ++-- lisp/double.el | 4 ++-- lisp/ebuff-menu.el | 4 ++-- lisp/echistory.el | 4 ++-- lisp/ediff-diff.el | 4 ++-- lisp/ediff-help.el | 4 ++-- lisp/ediff-hook.el | 4 ++-- lisp/ediff-init.el | 4 ++-- lisp/ediff-merg.el | 4 ++-- lisp/ediff-mult.el | 4 ++-- lisp/ediff-ptch.el | 4 ++-- lisp/ediff-util.el | 4 ++-- lisp/ediff-vers.el | 4 ++-- lisp/ediff-wind.el | 4 ++-- lisp/ediff.el | 4 ++-- lisp/edmacro.el | 4 ++-- lisp/ehelp.el | 4 ++-- lisp/electric.el | 4 ++-- lisp/elide-head.el | 4 ++-- lisp/emacs-lock.el | 4 ++-- lisp/env.el | 4 ++-- lisp/expand.el | 4 ++-- lisp/facemenu.el | 4 ++-- lisp/faces.el | 4 ++-- lisp/ffap.el | 4 ++-- lisp/filecache.el | 4 ++-- lisp/files.el | 4 ++-- lisp/find-dired.el | 4 ++-- lisp/find-file.el | 4 ++-- lisp/find-lisp.el | 4 ++-- lisp/finder.el | 4 ++-- lisp/flow-ctrl.el | 4 ++-- lisp/foldout.el | 4 ++-- lisp/follow.el | 4 ++-- lisp/font-core.el | 4 ++-- lisp/font-lock.el | 4 ++-- lisp/format.el | 4 ++-- lisp/forms.el | 4 ++-- lisp/frame.el | 4 ++-- lisp/fringe.el | 4 ++-- lisp/generic-x.el | 4 ++-- lisp/gs.el | 4 ++-- lisp/help-at-pt.el | 4 ++-- lisp/help-fns.el | 4 ++-- lisp/help-macro.el | 4 ++-- lisp/help-mode.el | 4 ++-- lisp/help.el | 4 ++-- lisp/hexl.el | 4 ++-- lisp/hi-lock.el | 4 ++-- lisp/hilit-chg.el | 4 ++-- lisp/hippie-exp.el | 4 ++-- lisp/hl-line.el | 4 ++-- lisp/ibuf-ext.el | 4 ++-- lisp/ibuf-macs.el | 4 ++-- lisp/ibuffer.el | 4 ++-- lisp/icomplete.el | 4 ++-- lisp/ido.el | 4 ++-- lisp/ielm.el | 4 ++-- lisp/iimage.el | 4 ++-- lisp/image-file.el | 4 ++-- lisp/image-mode.el | 4 ++-- lisp/image.el | 4 ++-- lisp/imenu.el | 4 ++-- lisp/indent.el | 4 ++-- lisp/info-look.el | 4 ++-- lisp/info-xref.el | 4 ++-- lisp/info.el | 4 ++-- lisp/informat.el | 4 ++-- lisp/international/titdic-cnv.el | 4 ++-- lisp/isearch.el | 4 ++-- lisp/isearchb.el | 4 ++-- lisp/iswitchb.el | 4 ++-- lisp/jit-lock.el | 4 ++-- lisp/jka-cmpr-hook.el | 4 ++-- lisp/jka-compr.el | 4 ++-- lisp/kermit.el | 4 ++-- lisp/kmacro.el | 4 ++-- lisp/ledit.el | 4 ++-- lisp/loadhist.el | 4 ++-- lisp/loadup.el | 4 ++-- lisp/locate.el | 4 ++-- lisp/log-edit.el | 4 ++-- lisp/log-view.el | 4 ++-- lisp/longlines.el | 4 ++-- lisp/lpr.el | 4 ++-- lisp/ls-lisp.el | 4 ++-- lisp/macros.el | 4 ++-- lisp/makefile.w32-in | 4 ++-- lisp/makesum.el | 4 ++-- lisp/man.el | 4 ++-- lisp/master.el | 4 ++-- lisp/menu-bar.el | 4 ++-- lisp/midnight.el | 4 ++-- lisp/minibuf-eldef.el | 4 ++-- lisp/misc.el | 4 ++-- lisp/mouse-copy.el | 4 ++-- lisp/mouse-drag.el | 4 ++-- lisp/mouse-sel.el | 4 ++-- lisp/mouse.el | 4 ++-- lisp/msb.el | 4 ++-- lisp/mwheel.el | 4 ++-- lisp/newcomment.el | 4 ++-- lisp/novice.el | 4 ++-- lisp/outline.el | 4 ++-- lisp/paren.el | 4 ++-- lisp/paths.el | 4 ++-- lisp/pcmpl-cvs.el | 4 ++-- lisp/pcmpl-gnu.el | 4 ++-- lisp/pcmpl-linux.el | 4 ++-- lisp/pcmpl-rpm.el | 4 ++-- lisp/pcmpl-unix.el | 4 ++-- lisp/pcomplete.el | 4 ++-- lisp/pcvs-defs.el | 4 ++-- lisp/pcvs-info.el | 4 ++-- lisp/pcvs-parse.el | 4 ++-- lisp/pcvs-util.el | 4 ++-- lisp/pcvs.el | 4 ++-- lisp/printing.el | 2 +- lisp/ps-bdf.el | 4 ++-- lisp/ps-mule.el | 4 ++-- lisp/ps-print.el | 2 +- lisp/recentf.el | 4 ++-- lisp/rect.el | 4 ++-- lisp/register.el | 4 ++-- lisp/repeat.el | 4 ++-- lisp/replace.el | 4 ++-- lisp/reposition.el | 4 ++-- lisp/resume.el | 4 ++-- lisp/reveal.el | 4 ++-- lisp/rfn-eshadow.el | 4 ++-- lisp/rot13.el | 4 ++-- lisp/ruler-mode.el | 4 ++-- lisp/s-region.el | 4 ++-- lisp/saveplace.el | 4 ++-- lisp/scroll-all.el | 4 ++-- lisp/scroll-bar.el | 4 ++-- lisp/select.el | 4 ++-- lisp/server.el | 4 ++-- lisp/ses.el | 4 ++-- lisp/shadowfile.el | 4 ++-- lisp/shell.el | 4 ++-- lisp/simple.el | 4 ++-- lisp/skeleton.el | 4 ++-- lisp/smerge-mode.el | 4 ++-- lisp/sort.el | 4 ++-- lisp/soundex.el | 4 ++-- lisp/speedbar.el | 4 ++-- lisp/startup.el | 4 ++-- lisp/strokes.el | 4 ++-- lisp/subr.el | 4 ++-- lisp/tabify.el | 4 ++-- lisp/talk.el | 4 ++-- lisp/tar-mode.el | 4 ++-- lisp/tempo.el | 4 ++-- lisp/term.el | 4 ++-- lisp/terminal.el | 4 ++-- lisp/textmodes/page-ext.el | 4 ++-- lisp/thumbs.el | 4 ++-- lisp/time-stamp.el | 4 ++-- lisp/time.el | 4 ++-- lisp/timezone.el | 4 ++-- lisp/tmm.el | 4 ++-- lisp/toolbar/tool-bar.el | 4 ++-- lisp/tooltip.el | 4 ++-- lisp/tree-widget.el | 4 ++-- lisp/type-break.el | 4 ++-- lisp/uniquify.el | 4 ++-- lisp/userlock.el | 4 ++-- lisp/vc-arch.el | 4 ++-- lisp/vc-cvs.el | 4 ++-- lisp/vc-hooks.el | 4 ++-- lisp/vc-mcvs.el | 4 ++-- lisp/vc-rcs.el | 4 ++-- lisp/vc-sccs.el | 4 ++-- lisp/vc-svn.el | 4 ++-- lisp/vc.el | 4 ++-- lisp/vcursor.el | 4 ++-- lisp/version.el | 4 ++-- lisp/view.el | 4 ++-- lisp/vms-patch.el | 4 ++-- lisp/vmsproc.el | 4 ++-- lisp/vt-control.el | 4 ++-- lisp/vt100-led.el | 4 ++-- lisp/w32-fns.el | 4 ++-- lisp/w32-vars.el | 4 ++-- lisp/wdired.el | 4 ++-- lisp/whitespace.el | 4 ++-- lisp/wid-browse.el | 4 ++-- lisp/wid-edit.el | 4 ++-- lisp/widget.el | 4 ++-- lisp/windmove.el | 4 ++-- lisp/window.el | 4 ++-- lisp/winner.el | 4 ++-- lisp/woman.el | 4 ++-- lisp/x-dnd.el | 4 ++-- lisp/xml.el | 4 ++-- lisp/xt-mouse.el | 4 ++-- lispintro/emacs-lisp-intro.texi | 2 +- lispref/tips.texi | 4 ++-- lispref/vol1.texi | 4 ++-- lispref/vol2.texi | 4 ++-- man/calc.texi | 2 +- man/mh-e.texi | 2 +- 262 files changed, 519 insertions(+), 519 deletions(-) (limited to 'lisp/tree-widget.el') diff --git a/configure.in b/configure.in index bc245479211..9d7740839eb 100644 --- a/configure.in +++ b/configure.in @@ -2813,8 +2813,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* No code in Emacs #includes config.h twice, but some bits of code diff --git a/etc/cs-refcard.tex b/etc/cs-refcard.tex index d5016ea8cc8..43e4e38612b 100644 --- a/etc/cs-refcard.tex +++ b/etc/cs-refcard.tex @@ -27,8 +27,8 @@ % You should have received a copy of the GNU General Public License % along with GNU Emacs; see the file COPYING. If not, write to -% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. +% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +% Boston, MA 02110-1301, USA. % This file is intended to be processed by plain TeX (TeX82). % diff --git a/etc/edt-user.doc b/etc/edt-user.doc index e5bd326038f..683c1ae2ba2 100644 --- a/etc/edt-user.doc +++ b/etc/edt-user.doc @@ -840,8 +840,8 @@ G-C-\: Split Window | FNDNXT | Yank | CUT | ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex index cda6f3f17d3..49f2a201650 100644 --- a/etc/fr-refcard.tex +++ b/etc/fr-refcard.tex @@ -24,8 +24,8 @@ % You should have received a copy of the GNU General Public License % along with GNU Emacs; see the file COPYING. If not, write to -% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. +% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +% Boston, MA 02110-1301, USA. % This file is intended to be processed by plain TeX (TeX82). % diff --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex index 5bfea15a8ab..df8c83566b3 100644 --- a/etc/pl-refcard.tex +++ b/etc/pl-refcard.tex @@ -48,8 +48,8 @@ % You should have received a copy of the GNU General Public License % along with GNU Emacs; see the file COPYING. If not, write to -% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. +% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +% Boston, MA 02110-1301, USA. % This file is intended to be processed by plain TeX (TeX82). % diff --git a/etc/refcard.tex b/etc/refcard.tex index 520e3f37b8c..2e6847da8d7 100644 --- a/etc/refcard.tex +++ b/etc/refcard.tex @@ -30,8 +30,8 @@ % You should have received a copy of the GNU General Public License % along with GNU Emacs; see the file COPYING. If not, write to -% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. +% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +% Boston, MA 02110-1301, USA. % This file is intended to be processed by plain TeX (TeX82). % diff --git a/etc/sk-refcard.tex b/etc/sk-refcard.tex index 73fd7c1f598..ca40c194c99 100644 --- a/etc/sk-refcard.tex +++ b/etc/sk-refcard.tex @@ -27,8 +27,8 @@ % You should have received a copy of the GNU General Public License % along with GNU Emacs; see the file COPYING. If not, write to -% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. +% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +% Boston, MA 02110-1301, USA. % This file is intended to be processed by plain TeX (TeX82). % diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 593dcc7fc3f..1174519af9a 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -15,8 +15,8 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. SHELL = /bin/sh diff --git a/lisp/abbrev.el b/lisp/abbrev.el index 0a40768af31..b63814e922a 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el index 9c8b0e0d583..a193a92df0f 100644 --- a/lisp/abbrevlist.el +++ b/lisp/abbrevlist.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/add-log.el b/lisp/add-log.el index 72eda86f131..ec802ef4ae7 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/align.el b/lisp/align.el index 563e839f5fe..5c1e8e7b89a 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/allout.el b/lisp/allout.el index 6fb81f9f6f7..518e37083e0 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 9b36a403b5d..31aaef2fcdc 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -21,8 +21,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/apropos.el b/lisp/apropos.el index 9ac6d32300d..37cb85494ab 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index b6a969d6c0a..b049f8ea734 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/array.el b/lisp/array.el index 2f270d0f086..836ba99ff6d 100644 --- a/lisp/array.el +++ b/lisp/array.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/autoarg.el b/lisp/autoarg.el index 78e71ef2186..ae1d26ecd20 100644 --- a/lisp/autoarg.el +++ b/lisp/autoarg.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index b7515070339..71fa14014a9 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -198,8 +198,8 @@ If this contains a %s, that will be replaced by the matching rule." ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 1769a992f7b..23156ceda47 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/avoid.el b/lisp/avoid.el index b5e7d1f9b62..032c7260cec 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/battery.el b/lisp/battery.el index 6e94c176513..cd6f7933c4e 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/bindings.el b/lisp/bindings.el index 7461b185bba..1e19592500b 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/bookmark.el b/lisp/bookmark.el index b89773d12c7..51a5e0469e5 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/bs.el b/lisp/bs.el index 4c8b74bb59f..67db5648893 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 79247ad30df..7f10e7f3c1f 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/button.el b/lisp/button.el index 78008f06db2..1b0c009e925 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -19,8 +19,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/calculator.el b/lisp/calculator.el index 0c6ad53dbce..923d4022098 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -;; MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +;; MA 02110-1301, USA. ;;;===================================================================== ;;; Commentary: diff --git a/lisp/case-table.el b/lisp/case-table.el index e9697655f38..31c26949281 100644 --- a/lisp/case-table.el +++ b/lisp/case-table.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/cdl.el b/lisp/cdl.el index 53c9ced9cec..68111eda53e 100644 --- a/lisp/cdl.el +++ b/lisp/cdl.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/chistory.el b/lisp/chistory.el index ddbc0863a0e..1704e7a4a1e 100644 --- a/lisp/chistory.el +++ b/lisp/chistory.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index 03cd8ee4d9c..102347f345a 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/comint.el b/lisp/comint.el index e751926912f..188af8a3b0b 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/compare-w.el b/lisp/compare-w.el index 353c015c8af..e0a6d5cf732 100644 --- a/lisp/compare-w.el +++ b/lisp/compare-w.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/complete.el b/lisp/complete.el index 60bddd01f17..dabab4ee6ee 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/completion.el b/lisp/completion.el index d7f728821f9..5e7285ecddd 100644 --- a/lisp/completion.el +++ b/lisp/completion.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/composite.el b/lisp/composite.el index 4f9faf2ccfa..5fd6b6529e0 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index bd9fd71b579..8818ed6ff70 100644 --- a/lisp/cus-dep.el +++ b/lisp/cus-dep.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 4889ec6d62d..76e8e5bf7ba 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 2a0198689de..6eaaf97288d 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/cus-start.el b/lisp/cus-start.el index db14975a480..7c10b57a1b2 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index 480743e70f2..32e01963824 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: diff --git a/lisp/custom.el b/lisp/custom.el index cb4e76dd65a..a8c9b864537 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el index c8bd1e7e905..a70e368ff89 100644 --- a/lisp/cvs-status.el +++ b/lisp/cvs-status.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index cbb2526c852..01591e2fdf3 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 04cd90961a1..1c0c8b77503 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/delsel.el b/lisp/delsel.el index 962fa156a07..483c2e2c599 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/descr-text.el b/lisp/descr-text.el index ce46b3f828d..3c548458713 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/desktop.el b/lisp/desktop.el index 8e81e8826fe..02616d23f5e 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index b9c9e338388..b6444aad2a4 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/diff.el b/lisp/diff.el index c985b66036e..bee7277af78 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index b517dffe9f7..c9d5c22ded3 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 86c955650e8..42df15b47d2 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dired.el b/lisp/dired.el index a13a9e54ebe..a2d1cf957a8 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el index 41aea04988b..5ae76f91316 100644 --- a/lisp/dirtrack.el +++ b/lisp/dirtrack.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/disp-table.el b/lisp/disp-table.el index 87781f5f8ae..0d0f4e4e09a 100644 --- a/lisp/disp-table.el +++ b/lisp/disp-table.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dnd.el b/lisp/dnd.el index 96c9e18a3f1..9a925550411 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index 1253b7b5811..920625526e3 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el index 93ff681796e..8fdff647bed 100644 --- a/lisp/dos-vars.el +++ b/lisp/dos-vars.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el index d7b411fab3f..644b457393f 100644 --- a/lisp/dos-w32.el +++ b/lisp/dos-w32.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/double.el b/lisp/double.el index c9c27203344..137ea510123 100644 --- a/lisp/double.el +++ b/lisp/double.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index ec230bc8a62..2a89d4ef654 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/echistory.el b/lisp/echistory.el index a01cad89f40..e134b16ce6c 100644 --- a/lisp/echistory.el +++ b/lisp/echistory.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 4e495d6d32b..659c4ffedb0 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el index 69d170faedf..87056e3723f 100644 --- a/lisp/ediff-help.el +++ b/lisp/ediff-help.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index 5394923aa36..8d038a4d93b 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 4863c255830..18e1a7128f1 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 237ce514cbb..13414747b11 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 3616bb267ce..c7ad411b4ac 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 4040985d1c8..45b214c0cb3 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index b7b39f405e5..9434601326c 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index effce2a1adf..653f4017cad 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index c43307938fc..3ac4ee089cd 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ediff.el b/lisp/ediff.el index 3a40aafda55..46b060e29ae 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -24,8 +24,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 939e275f1b9..4ab7c7b1029 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ehelp.el b/lisp/ehelp.el index 82a8e10301e..36bbd0329bb 100644 --- a/lisp/ehelp.el +++ b/lisp/ehelp.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/electric.el b/lisp/electric.el index 18a4d8388c5..32fb843e2cb 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/elide-head.el b/lisp/elide-head.el index fed6ecee7af..f47e9e871ea 100644 --- a/lisp/elide-head.el +++ b/lisp/elide-head.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el index 26ed4ffa39e..479cc4f2ede 100644 --- a/lisp/emacs-lock.el +++ b/lisp/emacs-lock.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/env.el b/lisp/env.el index 3d92501279e..606aa163c87 100644 --- a/lisp/env.el +++ b/lisp/env.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/expand.el b/lisp/expand.el index 2e2767289ce..e0ebad49caa 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 6dc6124af5d..55ddf663b28 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/faces.el b/lisp/faces.el index cad2e932519..35ec7ad24a5 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ffap.el b/lisp/ffap.el index 89e04c0f2bd..e30b859a588 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/filecache.el b/lisp/filecache.el index 90287ba5eef..9fccba4b84b 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/files.el b/lisp/files.el index 2504dd2d129..1840d3e5f06 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/find-dired.el b/lisp/find-dired.el index d52305a500a..e1b4ce65e71 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/find-file.el b/lisp/find-file.el index 69cafbc75b1..d741ed7d845 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el index f8130043177..35b24af3d6b 100644 --- a/lisp/find-lisp.el +++ b/lisp/find-lisp.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/finder.el b/lisp/finder.el index fb327524793..01052101e6d 100644 --- a/lisp/finder.el +++ b/lisp/finder.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el index 63654572f9b..0bfc5c7e92e 100644 --- a/lisp/flow-ctrl.el +++ b/lisp/flow-ctrl.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/foldout.el b/lisp/foldout.el index 10f3cecd3ee..9c6ef395ab5 100644 --- a/lisp/foldout.el +++ b/lisp/foldout.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/follow.el b/lisp/follow.el index 74dc12f8881..09b408cb452 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/font-core.el b/lisp/font-core.el index a78e21a762f..318191e1757 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: diff --git a/lisp/font-lock.el b/lisp/font-lock.el index cbde7926cac..a1b30292e61 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/format.el b/lisp/format.el index 62b957452b0..e676677179b 100644 --- a/lisp/format.el +++ b/lisp/format.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/forms.el b/lisp/forms.el index d1c5b0c5fd9..7b41698cf4f 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/frame.el b/lisp/frame.el index 6b69dead414..088a7a9b622 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/fringe.el b/lisp/fringe.el index 3c554f1ca55..71914bd95f3 100644 --- a/lisp/fringe.el +++ b/lisp/fringe.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/generic-x.el b/lisp/generic-x.el index fcf5b6c0e1d..55afcc73e62 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/gs.el b/lisp/gs.el index 2c38a55f6df..7a8fb807ccd 100644 --- a/lisp/gs.el +++ b/lisp/gs.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el index 00c62abe9ca..f3321e437de 100644 --- a/lisp/help-at-pt.el +++ b/lisp/help-at-pt.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/help-fns.el b/lisp/help-fns.el index ab9e118bfdf..6160391df95 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 3a7cf0898cb..cf3e63d8d76 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/help-mode.el b/lisp/help-mode.el index cd8c6a1c2dc..3349bc058f3 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/help.el b/lisp/help.el index 3323c329c97..bab0592160c 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/hexl.el b/lisp/hexl.el index e24f6b7f72b..894633a1f34 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index a924c89ba37..c649ed8d465 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index b6bfb297313..59468147cb7 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index bd726564da6..cdbc03bd1f7 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/hl-line.el b/lisp/hl-line.el index e553636674b..85617eab680 100644 --- a/lisp/hl-line.el +++ b/lisp/hl-line.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 87d9eb707eb..9aef1ed95be 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program ; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index effcafd9240..aebe923ee85 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program ; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 217696cb4aa..dd0fba20914 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program ; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/icomplete.el b/lisp/icomplete.el index ca94ca0d3db..9e9662c1697 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ido.el b/lisp/ido.el index f5941bf4ef2..d4d94164f3c 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Acknowledgements diff --git a/lisp/ielm.el b/lisp/ielm.el index 727face3695..66a1da39066 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/iimage.el b/lisp/iimage.el index 32f6aef9abd..b10679592b3 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/image-file.el b/lisp/image-file.el index 11676021afd..8f74dd63c0a 100644 --- a/lisp/image-file.el +++ b/lisp/image-file.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/image-mode.el b/lisp/image-mode.el index b29027fcf42..4999a880dfc 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/image.el b/lisp/image.el index b7b2d9988a8..561e0ac0abf 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/imenu.el b/lisp/imenu.el index 2248ece3dbd..a210b39c604 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/indent.el b/lisp/indent.el index 11f01068397..14488e79a62 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/info-look.el b/lisp/info-look.el index 4fc2c6b4c63..a408a7b2388 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/info-xref.el b/lisp/info-xref.el index ab9b26c10dd..bffe5681cd0 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/info.el b/lisp/info.el index 6bb8252f003..695d67c3647 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/informat.el b/lisp/informat.el index acfb093c064..f3688cb3668 100644 --- a/lisp/informat.el +++ b/lisp/informat.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index bb055b7bdb3..55a4b4ac6ad 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -696,7 +696,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." ;; # ;; # You should have received a copy of the GNU General Public License ;; # along with this program; if not, write to the Free Software Foundation, -;; # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.") +;; # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.") ("chinese-ctlaub" "$(0N,Gn(B" "CTLau-b5.html" big5 "CTLau-b5.el" @@ -722,7 +722,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." ;; # ;; # You should have received a copy of the GNU General Public License ;; # along with this program; if not, write to the Free Software Foundation, -;; # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.") +;; # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.") )) ;; Generate a code of a Quail package in the current buffer from Tsang diff --git a/lisp/isearch.el b/lisp/isearch.el index a8718836c58..58c8fd5829a 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/isearchb.el b/lisp/isearchb.el index dbcbb1b7af2..3665311aaf6 100644 --- a/lisp/isearchb.el +++ b/lisp/isearchb.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index d705faf9708..408b17c9332 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index ba2eed9f17e..d98e8791124 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index 62d83f9e93e..36775a25470 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index f282957512c..db18903e21f 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/kermit.el b/lisp/kermit.el index cf56a6216bb..1b22df1dbe2 100644 --- a/lisp/kermit.el +++ b/lisp/kermit.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 6aaa8c8f224..28e2c17c2a8 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ledit.el b/lisp/ledit.el index 565550efe47..cab3c6c7d6c 100644 --- a/lisp/ledit.el +++ b/lisp/ledit.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/loadhist.el b/lisp/loadhist.el index da6fd695da3..bcdf47387da 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/loadup.el b/lisp/loadup.el index f3a793b252c..26070965994 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/locate.el b/lisp/locate.el index 30a6ff41df3..4289d3e975c 100644 --- a/lisp/locate.el +++ b/lisp/locate.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/log-edit.el b/lisp/log-edit.el index 0d84ecd0504..a3876df8cce 100644 --- a/lisp/log-edit.el +++ b/lisp/log-edit.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/log-view.el b/lisp/log-view.el index 302246e2f4c..66e8b27c0ff 100644 --- a/lisp/log-view.el +++ b/lisp/log-view.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/longlines.el b/lisp/longlines.el index c6de1d2347e..5d68c0a06a3 100644 --- a/lisp/longlines.el +++ b/lisp/longlines.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/lpr.el b/lisp/lpr.el index 445c793fcdd..5714c746631 100644 --- a/lisp/lpr.el +++ b/lisp/lpr.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 2e163270f90..dee98a87823 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/macros.el b/lisp/macros.el index 41024e4e40f..79471ed905c 100644 --- a/lisp/macros.el +++ b/lisp/macros.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index ce451560bc4..8c6007af558 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -15,8 +15,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # ALL = diff --git a/lisp/makesum.el b/lisp/makesum.el index 21a69d5f541..985012f90d1 100644 --- a/lisp/makesum.el +++ b/lisp/makesum.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/man.el b/lisp/man.el index 0037d132624..cb62aa65e94 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/master.el b/lisp/master.el index b9908e82b55..bdc5144d63c 100644 --- a/lisp/master.el +++ b/lisp/master.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index f8aaf2de77c..b6230189cc5 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;; Avishai Yacobi suggested some menu rearrangements. diff --git a/lisp/midnight.el b/lisp/midnight.el index 83b21dda7e4..8bc00b83103 100644 --- a/lisp/midnight.el +++ b/lisp/midnight.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index 908b77aab33..f3b08be702f 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/misc.el b/lisp/misc.el index 31a35affad0..c081a8cd8c4 100644 --- a/lisp/misc.el +++ b/lisp/misc.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el index 528cfb8d824..6279d4e1f46 100644 --- a/lisp/mouse-copy.el +++ b/lisp/mouse-copy.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el index 9906114ca30..6971bdb9a89 100644 --- a/lisp/mouse-drag.el +++ b/lisp/mouse-drag.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el index 4cabafe737d..1a271a5ab7d 100644 --- a/lisp/mouse-sel.el +++ b/lisp/mouse-sel.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mouse.el b/lisp/mouse.el index 03740e780d5..4fd81ced998 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/msb.el b/lisp/msb.el index 02ab487bc69..945535267ff 100644 --- a/lisp/msb.el +++ b/lisp/msb.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 231b7c3d6e3..27116c75e98 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/newcomment.el b/lisp/newcomment.el index 590e6ce37ba..c0ad722c158 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/novice.el b/lisp/novice.el index 171285ca3f1..6fd67d4ac1e 100644 --- a/lisp/novice.el +++ b/lisp/novice.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/outline.el b/lisp/outline.el index 62d2e57933f..6b662664b58 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/paren.el b/lisp/paren.el index 7c6abe087b9..f0bf458a3ab 100644 --- a/lisp/paren.el +++ b/lisp/paren.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/paths.el b/lisp/paths.el index e3fac711b43..b79e925aee3 100644 --- a/lisp/paths.el +++ b/lisp/paths.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el index 805f42ea41a..54ab07e6e85 100644 --- a/lisp/pcmpl-cvs.el +++ b/lisp/pcmpl-cvs.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el index 32810d7dba6..36713323075 100644 --- a/lisp/pcmpl-gnu.el +++ b/lisp/pcmpl-gnu.el @@ -16,8 +16,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el index 1822b514c41..bb77bf00231 100644 --- a/lisp/pcmpl-linux.el +++ b/lisp/pcmpl-linux.el @@ -16,8 +16,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el index e4d6ebc1a80..50c4906886f 100644 --- a/lisp/pcmpl-rpm.el +++ b/lisp/pcmpl-rpm.el @@ -16,8 +16,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index fe26b089f77..edbc1b28586 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -16,8 +16,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index b01bef39664..3f0ffc54eeb 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el index 394c3580945..1e4c29f5583 100644 --- a/lisp/pcvs-defs.el +++ b/lisp/pcvs-defs.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el index d56fa19fd32..0a48fc7d8e7 100644 --- a/lisp/pcvs-info.el +++ b/lisp/pcvs-info.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 7ab6c53b4a0..1b08473d305 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el index 2cbb00b324c..9531f06b3c6 100644 --- a/lisp/pcvs-util.el +++ b/lisp/pcvs-util.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/pcvs.el b/lisp/pcvs.el index be93104a33f..34a93a1d659 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -29,8 +29,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/printing.el b/lisp/printing.el index 2dbe460c0cc..c73242961cf 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -31,7 +31,7 @@ Please send all bug fixes and enhancements to ;; You should have received a copy of the GNU General Public License along with ;; GNU Emacs; see the file COPYING. If not, write to the Free Software -;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el index a6675f9b811..056438a2bc5 100644 --- a/lisp/ps-bdf.el +++ b/lisp/ps-bdf.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index ba858959cc3..3f28771f3a0 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -24,8 +24,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 79215f2a8ad..484c207e074 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -38,7 +38,7 @@ Please send all bug fixes and enhancements to ;; You should have received a copy of the GNU General Public License along with ;; GNU Emacs; see the file COPYING. If not, write to the Free Software -;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/recentf.el b/lisp/recentf.el index 64af3b1da3f..57280a7b4bc 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/rect.el b/lisp/rect.el index e53198bc753..08b601c050e 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/register.el b/lisp/register.el index eaa53446c56..4789047b0af 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/repeat.el b/lisp/repeat.el index 5f0811d355c..b1b8cc40aa8 100644 --- a/lisp/repeat.el +++ b/lisp/repeat.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/replace.el b/lisp/replace.el index 3b93761a0cc..4b745d54433 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/reposition.el b/lisp/reposition.el index 8dc752c2357..41283ce251a 100644 --- a/lisp/reposition.el +++ b/lisp/reposition.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/resume.el b/lisp/resume.el index 4a131034e51..db21a4bab4c 100644 --- a/lisp/resume.el +++ b/lisp/resume.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/reveal.el b/lisp/reveal.el index c08f9b604cb..402fa7c4f49 100644 --- a/lisp/reveal.el +++ b/lisp/reveal.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el index 84731115d1a..5c7865d864f 100644 --- a/lisp/rfn-eshadow.el +++ b/lisp/rfn-eshadow.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/rot13.el b/lisp/rot13.el index bcf4252d142..99b34ef9d17 100644 --- a/lisp/rot13.el +++ b/lisp/rot13.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index 9e85b7846ca..783e511d0b2 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/s-region.el b/lisp/s-region.el index 4153174ee24..d3fa6b1f307 100644 --- a/lisp/s-region.el +++ b/lisp/s-region.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/saveplace.el b/lisp/saveplace.el index 34c88a89948..afb10ede9d5 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el index 287ed3ba472..2c0636d69d2 100644 --- a/lisp/scroll-all.el +++ b/lisp/scroll-all.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; This mode allows multiple buffers to be 'locked' so that scrolling diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el index 2d2921e9fc9..64429ba4da5 100644 --- a/lisp/scroll-bar.el +++ b/lisp/scroll-bar.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/select.el b/lisp/select.el index 565ddd7d22e..46f9fd7fab3 100644 --- a/lisp/select.el +++ b/lisp/select.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/server.el b/lisp/server.el index 0a5fc942206..73878d8435b 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/ses.el b/lisp/ses.el index bad396bbe94..f7de1ddb50a 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index 653c1e7f042..2e5943db0f5 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/shell.el b/lisp/shell.el index a8f4790a054..2684ee30a65 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/simple.el b/lisp/simple.el index d0dcbbfc42c..b5e7d188695 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 5f25e881218..f854621cc85 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 9e129c3571d..45e68750cb3 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/sort.el b/lisp/sort.el index d90369cabcd..e2fe806c430 100644 --- a/lisp/sort.el +++ b/lisp/sort.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/soundex.el b/lisp/soundex.el index fb9d72f8fa9..2ed79b29455 100644 --- a/lisp/soundex.el +++ b/lisp/soundex.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/speedbar.el b/lisp/speedbar.el index a01b9ddb47e..188304bce74 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/startup.el b/lisp/startup.el index 0b3f5ddbc10..83b8729e202 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/strokes.el b/lisp/strokes.el index 396a44cec24..bb99591d1e1 100644 --- a/lisp/strokes.el +++ b/lisp/strokes.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/subr.el b/lisp/subr.el index d489000f7e7..c0405f46011 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/tabify.el b/lisp/tabify.el index a28f0d6ccd2..78ee80bee1b 100644 --- a/lisp/tabify.el +++ b/lisp/tabify.el @@ -18,8 +18,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/talk.el b/lisp/talk.el index bbe9c949dde..d2436e59ff2 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 51042f8aa54..041f0fddc1a 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/tempo.el b/lisp/tempo.el index 49a73ef1098..3f5687d0d08 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/term.el b/lisp/term.el index 122953af124..047db5708af 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Marck 13 2001 ;;; Fixes for CJK support by Yong Lu . diff --git a/lisp/terminal.el b/lisp/terminal.el index afce6f51287..d9ba5d3f728 100644 --- a/lisp/terminal.el +++ b/lisp/terminal.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index 0b2b1477f80..c8828e1a6d5 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -120,8 +120,8 @@ ;; ;; FSF ;; Free Software Foundation -;; 59 Temple Place - Suite 330 -;; Boston, MA 02111-1307 USA. +;; 51 Franklin Street, Fifth Floor +;; Boston, MA 02110-1301 USA. ;; (617) 542-5942 ;; gnu@gnu.org ;; diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 09fe77cf352..478fb0b6528 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;; ;; Thanks: Alex Schroeder for maintaining the package at some time ;; The peoples at #emacs@freenode.net for numerous help diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el index 4cba3b5f456..5b763d2f0ff 100644 --- a/lisp/time-stamp.el +++ b/lisp/time-stamp.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/time.el b/lisp/time.el index f6ddced4d38..a6a4d771a2c 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/timezone.el b/lisp/timezone.el index 62c8f86f79b..cd6e3ce769f 100644 --- a/lisp/timezone.el +++ b/lisp/timezone.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/tmm.el b/lisp/tmm.el index aa47012c642..a55b11b17f6 100644 --- a/lisp/tmm.el +++ b/lisp/tmm.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el index 5f2e3afd46c..45c51532c9f 100644 --- a/lisp/toolbar/tool-bar.el +++ b/lisp/toolbar/tool-bar.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/tooltip.el b/lisp/tooltip.el index 6b78acd0597..fabb154d7ed 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el index 76d89afca87..407fb65ea49 100644 --- a/lisp/tree-widget.el +++ b/lisp/tree-widget.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/type-break.el b/lisp/type-break.el index 0585e5bc61d..4545351f5a9 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/uniquify.el b/lisp/uniquify.el index e9b8b1e1da2..9e241a55f8b 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/userlock.el b/lisp/userlock.el index e6e5ef0a1b5..5e2f337db07 100644 --- a/lisp/userlock.el +++ b/lisp/userlock.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index 569f864c0ea..d59e7143179 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index e4e9f0b0137..16759351407 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 52b4659cec6..5e8bf4f523c 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index eef01f2aad5..e324cb7eb1c 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 6e6bb04c2ec..e591baf3a26 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el index b691775f63b..c4a48274e36 100644 --- a/lisp/vc-sccs.el +++ b/lisp/vc-sccs.el @@ -22,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index b6e3ac29568..9e0b3414a04 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vc.el b/lisp/vc.el index b89298604eb..d4ece57a3d6 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Credits: diff --git a/lisp/vcursor.el b/lisp/vcursor.el index ac04603dbf8..fd7d1416661 100644 --- a/lisp/vcursor.el +++ b/lisp/vcursor.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/version.el b/lisp/version.el index d2d45a361f7..05fdde95221 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/view.el b/lisp/view.el index e184d68b117..c327dcdaa36 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el index d8d44d9d752..886b8572e77 100644 --- a/lisp/vms-patch.el +++ b/lisp/vms-patch.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el index da8715e860d..9871daa7a5e 100644 --- a/lisp/vmsproc.el +++ b/lisp/vmsproc.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vt-control.el b/lisp/vt-control.el index edc4f927346..ed65c93290f 100644 --- a/lisp/vt-control.el +++ b/lisp/vt-control.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el index d78960a5785..805746dd495 100644 --- a/lisp/vt100-led.el +++ b/lisp/vt100-led.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 86703a3b9b5..28f268bf623 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el index 30dae3f9987..5c6741a3f3e 100644 --- a/lisp/w32-vars.el +++ b/lisp/w32-vars.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/wdired.el b/lisp/wdired.el index a82176af5e8..c22a8dff633 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/whitespace.el b/lisp/whitespace.el index a119793c3a9..f1255df9482 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el index 57c4ebdb548..17fe9c24214 100644 --- a/lisp/wid-browse.el +++ b/lisp/wid-browse.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index b582ca6854a..062a7886789 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Wishlist items (from widget.texi): diff --git a/lisp/widget.el b/lisp/widget.el index f7e7d5d899c..f6c8efa6374 100644 --- a/lisp/widget.el +++ b/lisp/widget.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; diff --git a/lisp/windmove.el b/lisp/windmove.el index 986280c0bb1..785a7538a69 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -20,8 +20,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;; ;; -------------------------------------------------------------------- diff --git a/lisp/window.el b/lisp/window.el index 75052f9a5f1..c31b3149556 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/winner.el b/lisp/winner.el index 603eb80d9f0..c64d00d6255 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/woman.el b/lisp/woman.el index b1f8581ab9c..9ad3b50e381 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -23,8 +23,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 78a41d54625..0a4017a7b7c 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/xml.el b/lisp/xml.el index f4300817836..53cf850b983 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index 797893c8f2b..e8b0cee00e4 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi index bd4df97562e..d2ef7d1ce2c 100644 --- a/lispintro/emacs-lisp-intro.texi +++ b/lispintro/emacs-lisp-intro.texi @@ -21333,7 +21333,7 @@ that lists free books available from other publishers:@* @display Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307, USA +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/lispref/tips.texi b/lispref/tips.texi index df765d27e12..6e309155876 100644 --- a/lispref/tips.texi +++ b/lispref/tips.texi @@ -895,8 +895,8 @@ if we haven't installed it in Emacs yet! ;; This file is part of GNU Emacs. @dots{} -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. @end group @end smallexample diff --git a/lispref/vol1.texi b/lispref/vol1.texi index 1e2b0da728a..f772fc58be5 100644 --- a/lispref/vol1.texi +++ b/lispref/vol1.texi @@ -173,8 +173,8 @@ ISBN 1-882114-71-X @sp 2 Published by the Free Software Foundation @* -59 Temple Place, Suite 330 @* -Boston, MA 02111-1307 USA +51 Franklin Street, Fifth Floor @* +Boston, MA 02110-1301 USA @sp 1 Permission is granted to make and distribute verbatim copies of this diff --git a/lispref/vol2.texi b/lispref/vol2.texi index f58deb3948f..a4c6d4ae795 100644 --- a/lispref/vol2.texi +++ b/lispref/vol2.texi @@ -174,8 +174,8 @@ ISBN 1-882114-71-X @sp 2 Published by the Free Software Foundation @* -59 Temple Place, Suite 330 @* -Boston, MA 02111-1307 USA +51 Franklin Street, Fifth Floor @* +Boston, MA 02110-1301 USA @sp 1 Permission is granted to make and distribute verbatim copies of this diff --git a/man/calc.texi b/man/calc.texi index 7aa55d26a96..a2dd6c7c7d8 100644 --- a/man/calc.texi +++ b/man/calc.texi @@ -533,7 +533,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @end smallexample Also add information on how to contact you by electronic and paper mail. diff --git a/man/mh-e.texi b/man/mh-e.texi index 8e48f32cb81..7f95178fde1 100644 --- a/man/mh-e.texi +++ b/man/mh-e.texi @@ -3886,7 +3886,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @end smallexample Also add information on how to contact you by electronic and paper mail. -- cgit v1.2.3