Development: emacs-w3m/Attic/w3m-e23.el

* w3m-ems.el: New file merging w3m-e21.el, w3m-e23.el and w3m-fsf.el.
(image-size): No need to silence the byte compiler.
(w3m-ccl-get-ucs-codepoint-with-emacs-unicode): Remove.
(w3m-euc-japan-encoder, w3m-euc-japan-encoder, w3m-iso-latin-1-encoder)
(w3m-iso-latin-1-encoder): Redefine them only for Emacs 22 and earlier.

* w3m-e21.el, w3m-e23.el, w3m-fsf.el: Remove.

* w3m.el: Load w3m-ems.el instead of w3m-e21.el or w3m-e23.el.
(w3m-fontify-strike-through): Remove variable.

* w3mhack.el (w3mhack-mdelete): Remove.
(w3mhack-module-list): Use w3m-ems.el instead of w3m-fsf.el and w3m-e21.el or
 w3m-e23.el.

* Makefile.in (tarball): No need to exclude w3m-e23.el.

Hi,

I've made the temporary branch `ems1' to verify merging w3m-e21.el, w3m-e23.el
 and w3m-fsf.el into w3m-ems.el.  Could you please test it?

Changes:

* w3m-ems.el: New file merging w3m-e21.el, w3m-e23.el and w3m-fsf.el.
(image-size): No need to silence the byte compiler.
(w3m-ccl-get-ucs-codepoint-with-emacs-unicode): Remove.
(w3m-euc-japan-encoder, w3m-euc-japan-encoder)
(w3m-iso-latin-1-encoder, w3m-iso-latin-1-encoder): Redefine them only for
 Emacs 22 and earlier.

* w3m-e21.el, w3m-e23.el, w3m-fsf.el: Remove.

* w3m.el: Load w3m-ems.el instead of w3m-e21.el or w3m-e23.el.
(w3m-fontify-strike-through): Remove variable.

* w3mhack.el (w3mhack-mdelete): Remove.
(w3mhack-module-list): Use w3m-ems.el instead of w3m-fsf.el and w3m-e21.el or
 w3m-e23.el.

* Makefile.in (tarball): No need to exclude w3m-e23.el.

Regards,

Synch up with w3m-e21.el.

(w3m-toolbar-configurations): Select frame visiting buffer which is about to
 apply configurations.

* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Use (featurep 'gtk) instead of
 (boundp 'gtk-version-string).

* w3m-e21.el (w3m-use-toolbar) (w3m-toolbar-icon-preferred-image-types)
 (w3m-toolbar-configurations): Use (featurep 'gtk) instead of
 (boundp 'gtk-version-string).

(w3m-toolbar-configurations): Enable it for GTK Emacs;
 exclude auto-resize-tool-bars and auto-raise-tool-bar-buttons.

* w3m-xmas.el (w3m-define-w3m-make-ccl-coding-system): Rename from
 w3m-xmas-define-w3m-make-ccl-coding-system.
(w3m-toolbar-make-buttons): Rename from w3m-xmas-make-toolbar-buttons.
(w3m-define-missing-widgets): Rename from w3m-xmas-define-missing-widgets.
(w3m-show-current-title-in-buffer-tab): Rename from
 w3m-xmas-show-current-title-in-buffer-tab.
(w3m-setup-tab-in-gutter): Rename from w3m-xmas-setup-tab-in-gutter.
(w3m-update-tab-in-gutter): Rename from w3m-xmas-update-tab-in-gutter.

* w3m-e21.el (w3m-toolbar-icon-preferred-image-types)
(w3m-toolbar-icon-preferred-image-types): Use w3m-update-toolbars instead of
 w3m-setup-toolbar.
(w3m-toolbar-configurations): Rename from w3m-e21-toolbar-configurations; make
 it customizable for LUCID Emacs.
(w3m-toolbar-define-keys): Rename from w3m-e21-setup-toolbar; don't apply
 w3m-toolbar-configurations here.
(w3m-toolbar-make-buttons): Rename from w3m-e21-make-toolbar-buttons.
(w3m-toolbar-set-configurations): New function.
(w3m-setup-toolbar): Remove force argument; apply w3m-toolbar-configurations
 here.
(w3m-update-toolbars): New function.
(w3m-switch-to-buffer): Rename from w3m-e21-switch-to-buffer.
(w3m-subst-switch-to-buffer-keys): Rename from
 w3m-e21-subst-switch-to-buffer-keys.

* w3m-xmas.el (w3m-toolbar-icon-preferred-image-types)
 (w3m-toolbar-use-single-image-per-icon): New variables.
(w3m-find-image): New function.
(w3m-xmas-make-toolbar-buttons): Use it; add force argument.
(w3m-setup-toolbar): Use it; add force and buffer arguments.
(w3m-initialize-graphic-icons): Use it.

* w3m-e21.el (w3m-toolbar-icon-preferred-image-types)
(w3m-toolbar-use-single-image-per-icon): Apply customized value to tool bar
 immediately.
(w3m-e21-make-toolbar-buttons, w3m-setup-toolbar): Add force arg.

* icons/*.png, icons30/*.png: New files.

* Makefile.in (install-icons, install-icons30): Install png files.

* w3mhack.el (w3mhack-nonunix-install, w3mhack-make-package): Install png files.
(w3mhack-what-where): Update for png files.

* w3m-e21.el (w3m-use-toolbar): Check whether tool-bar and gtk-version-string
 are available.
(w3m-toolbar-icon-preferred-image-types)
(w3m-toolbar-use-single-image-per-icon): New variables.
(w3m-find-image): New function.
(w3m-e21-make-toolbar-buttons, w3m-setup-toolbar)
(w3m-initialize-graphic-icons): Use it.

Autoload iswitchb-read-buffer when compiling.

Update copyright years.

(w3m-e21-switch-to-buffer): Add iswitchb-mode support.

* w3m-e21.el (w3m-tab-make-keymap): Support mouse wheel on the
tab.

* w3m-e23.el (w3m-tab-make-keymap): Ditto.

* w3m-e21.el (w3m-tab-selected-background-face): New face.
(w3m-tab-separator): Put `mouse-face' for the shape of a mouse
button.
(w3m-tab-line): Ditto.

* w3m-e23.el (w3m-tab-selected-background-face): New face.
(w3m-tab-separator): Put `mouse-face' for the shape of a mouse
button.
(w3m-tab-line): Ditto.

* w3m.el (w3m-tab-button-menu-commands): Disable same items if
`w3m-tab-button-menu-current-buffer' is nil.
(w3m-tab-button-menu2): New function.

* w3m-e21.el (top): Add the variables and function to avoid
byte-compile warnings.
(w3m-tab-drag-mouse-function): Support drag & drop to out of the
frame. Don't call `bury-buffer'.
(w3m-tab-click-mouse-function): Don't call `bury-buffer'.
(w3m-tab-double-click-mouse1-function): new function.
(w3m-tab-double-click-mouse2-function): Ditto.
(w3m-tab-make-keymap): Add some methods.

* w3m-e23.el (top): Add the variables and function to avoid
byte-compile warnings.
(w3m-tab-drag-mouse-function): Support drag & drop to out of the
frame. Don't call `bury-buffer'.
(w3m-tab-click-mouse-function): Don't call `bury-buffer'.
(w3m-tab-double-click-mouse1-function): new function.
(w3m-tab-double-click-mouse2-function): Ditto.
(w3m-tab-make-keymap): Add some methods.

(w3m-tab-make-keymap): Bind mouse-3 to menu.

Fix face problem.

(w3m-tab-drag-mouse-function): Lower the buffer displayed before moving to the
 other tab.
(w3m-tab-click-mouse-function): Ditto.

Modify multi FACE support (only inner html non-widget face).
	* w3m-util.el (w3m-add-face-property): Add new functions.
	(w3m-remove-face-property): Ditto.

	* w3m.el (w3m-fontify-bold, w3m-fontify-underline)
	(w3m-fontify-strike-through, w3m-fontify-anchors)
	(w3m-fontify-images): Replace `w3m-add-text-properties' to
	`w3m-add-face-property' at FACE.
	(w3m-refontify-anchor): Change for FACE properly is list type.

	* w3m-e23.el (w3m-insert-image, w3m-remove-image): Ditto.

	* w3m-e21.el (w3m-insert-image, w3m-remove-image): Ditto.

Update FSF's address in GPL notices.

< 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

(w3m-force-window-update): Use `defalias' instead of `defun' in order to avoid
 compile warning which is issued because w3m-util.el defines it as `ignore'
 in advance.

* w3m-util.el (w3m-replace-in-string): Don't use eval-and-compile.
(w3m-compare-strings): Ditto.
(w3m-force-window-update): Alias to ignore if it is not defined.
(w3m-force-window-update-later): New function.

* w3m-favicon.el (w3m-favicon-retrieve): Use w3m-force-window-update-later.

* w3m-proc.el (w3m-process-stop): Use w3m-force-window-update-later.

* w3m.el (w3m-retrieve-and-render): Use w3m-force-window-update-later.
(w3m-select-buffer-show-this-line): Always run w3m-force-window-update.

;; From Yamato-san.
* w3m-e21.el (w3m-initialize-graphic-icons): Highlight icon under mouse.

(w3m-tab-mouse-face): New face.
(w3m-setup-header-line): Use highlight face for bg color.
(w3m-tab-line): Use w3m-tab-mouse-face.

;; From Yamato-san.
(w3m-setup-header-line): Highlight url under mouse.
(w3m-tab-line): Highlight tab under mouse.

Merge trunk.

* w3m-xmas.el (w3m-setup-toolbar): Make sure icon files exist.
(w3m-update-toolbar): Make sure toolbar items have been specified.
(w3m-initialize-graphic-icons): Make sure icon files exist.

* w3m-e21.el (w3m-setup-toolbar): Make sure icon files exist.
(w3m-initialize-graphic-icons): Ditto.

Synch to the trunk.

* w3m.el: Load w3m-e23.el for Emacs 23.

* w3mhack.el (w3mhack-module-list): Use w3m-e23.el for Emacs 23.

* w3m-e23.el: Rename from w3m-e22.el.

	Diffs between Use Text Field merge-w3m-fb- end-of-emacs-19-20-support- ems1 emacs-w3m-1_4_50- emacs-w3m-1_4_4 emacs-w3m-1_4 branch-off-to-ems1- before-merge-w3m-fb- before-merge-trunk-2005-03-24- after-merge-trunk-2005-03-24- MAIN HEAD and Use Text Field merge-w3m-fb- end-of-emacs-19-20-support- ems1 emacs-w3m-1_4_50- emacs-w3m-1_4_4 emacs-w3m-1_4 branch-off-to-ems1- before-merge-w3m-fb- before-merge-trunk-2005-03-24- after-merge-trunk-2005-03-24- MAIN HEAD
	Generate output suitable for use with a patch program
	Type of Diff should be a Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

---

View only Branch: Show all branches ems1 emacs-w3m-1_4 MAIN

---

Sort log by: Not sorted Commit date Revision

---

CVS Admin Powered by ViewCVS 1.0-dev

ViewCVS and CVS Help