From 0e7aba9b18c9a9e1b2fc82c7180940b84629d43b Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sat, 21 Dec 2024 17:25:00 +0100 Subject: [PATCH] update centered-cursor-mode Signed-off-by: Andreas Gerler --- .../centered-cursor-mode-pkg.el | 12 ---- .../centered-cursor-mode-autoloads.el | 55 +++++++++---------- .../centered-cursor-mode-pkg.el | 10 ++++ .../centered-cursor-mode.el | 35 +++++++++--- 4 files changed, 61 insertions(+), 51 deletions(-) delete mode 100644 elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode-pkg.el rename elpa/{centered-cursor-mode-20200507.1529 => centered-cursor-mode-20230914.1358}/centered-cursor-mode-autoloads.el (73%) create mode 100644 elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode-pkg.el rename elpa/{centered-cursor-mode-20200507.1529 => centered-cursor-mode-20230914.1358}/centered-cursor-mode.el (93%) diff --git a/elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode-pkg.el b/elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode-pkg.el deleted file mode 100644 index bdeceb80..00000000 --- a/elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode-pkg.el +++ /dev/null @@ -1,12 +0,0 @@ -(define-package "centered-cursor-mode" "20200507.1529" "cursor stays vertically centered" 'nil :commit "e9ee518d314ef7fb105a1e0cdc33dbb4dfe9d9e4" :authors - '(("André Riemann" . "andre.riemann@web.de")) - :maintainers - '(("André Riemann" . "andre.riemann@web.de")) - :maintainer - '("André Riemann" . "andre.riemann@web.de") - :keywords - '("convenience") - :url "https://github.com/andre-r/centered-cursor-mode.el") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode-autoloads.el b/elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode-autoloads.el similarity index 73% rename from elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode-autoloads.el rename to elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode-autoloads.el index ed245257..9dad77ef 100644 --- a/elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode-autoloads.el +++ b/elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode-autoloads.el @@ -1,40 +1,39 @@ -;;; centered-cursor-mode-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; centered-cursor-mode-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "centered-cursor-mode" "centered-cursor-mode.el" -;;;;;; (0 0 0 0)) ;;; Generated autoloads from centered-cursor-mode.el (autoload 'ccm-visible-text-lines "centered-cursor-mode" "\ -Visible text lines" nil nil) - +Visible text lines") (autoload 'centered-cursor-mode "centered-cursor-mode" "\ Makes the cursor stay vertically in a defined + position (usually centered). This is a minor mode. If called interactively, toggle the -`Centered-Cursor mode' mode. If the prefix argument is positive, -enable the mode, and if it is zero or negative, disable the mode. +`Centered-Cursor mode' mode. If the prefix argument is positive, enable +the mode, and if it is zero or negative, disable the mode. -If called from Lisp, toggle the mode if ARG is `toggle'. Enable -the mode if ARG is nil, omitted, or is a positive number. -Disable the mode if ARG is a negative number. +If called from Lisp, toggle the mode if ARG is `toggle'. Enable the +mode if ARG is nil, omitted, or is a positive number. Disable the mode +if ARG is a negative number. To check whether the minor mode is enabled in the current buffer, -evaluate `centered-cursor-mode'. +evaluate the variable `centered-cursor-mode'. -The mode's hook is called both when the mode is enabled and when -it is disabled. - -\(fn &optional ARG)" t nil) +The mode's hook is called both when the mode is enabled and when it is +disabled. +(fn &optional ARG)" t) (put 'global-centered-cursor-mode 'globalized-minor-mode t) - (defvar global-centered-cursor-mode nil "\ Non-nil if Global Centered-Cursor mode is enabled. See the `global-centered-cursor-mode' command @@ -42,9 +41,7 @@ for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `global-centered-cursor-mode'.") - (custom-autoload 'global-centered-cursor-mode "centered-cursor-mode" nil) - (autoload 'global-centered-cursor-mode "centered-cursor-mode" "\ Toggle Centered-Cursor mode in all buffers. With prefix ARG, enable Global Centered-Cursor mode if ARG is @@ -60,21 +57,19 @@ Centered-Cursor mode is enabled in all buffers where See `centered-cursor-mode' for more information on Centered-Cursor mode. -\(fn &optional ARG)" t nil) - +(fn &optional ARG)" t) (register-definition-prefixes "centered-cursor-mode" '("animate-first-start-p" "ccm-" "recenter-sequence")) - -;;;*** -;;;### (autoloads nil nil ("centered-cursor-mode-pkg.el") (0 0 0 -;;;;;; 0)) +;;; End of scraped data + +(provide 'centered-cursor-mode-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; centered-cursor-mode-autoloads.el ends here diff --git a/elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode-pkg.el b/elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode-pkg.el new file mode 100644 index 00000000..1c35b1fb --- /dev/null +++ b/elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode-pkg.el @@ -0,0 +1,10 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "centered-cursor-mode" "20230914.1358" + "Cursor stays vertically centered." + () + :url "https://github.com/andre-r/centered-cursor-mode.el" + :commit "67ef719e685407dbc455c7430765e4e685fd95a9" + :revdesc "67ef719e6854" + :keywords '("convenience") + :authors '(("André Riemann" . "andre.riemann@web.de")) + :maintainers '(("André Riemann" . "andre.riemann@web.de"))) diff --git a/elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode.el b/elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode.el similarity index 93% rename from elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode.el rename to elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode.el index bc6f6716..54f1152b 100644 --- a/elpa/centered-cursor-mode-20200507.1529/centered-cursor-mode.el +++ b/elpa/centered-cursor-mode-20230914.1358/centered-cursor-mode.el @@ -8,9 +8,10 @@ ;; Keywords: convenience ;; URL: https://github.com/andre-r/centered-cursor-mode.el -;; Compatibility: tested with GNU Emacs 24, 26, 27 -;; Version: 0.5.12 -;; Last-Updated: 2020-05-07 +;; Compatibility: tested with GNU Emacs 24, 26, 27, 28 +;; Package-Version: 20230914.1358 +;; Package-Revision: 67ef719e6854 +;; Last-Updated: 2023-09-13 ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -56,6 +57,9 @@ ;; - more bugs? ;;; Change Log: +;; 2023-09-11 sir4ur0n, andre-r +;; * support Emacs 29.1 mouse-wheel-[up|down]-alternate-event +;; * some problems with shift mouse-wheel remain ;; 2020-05-07 hlissner ;; * autoload global-centered-cursor-mode ;; 2019-03-06 kqr @@ -229,7 +233,16 @@ to successively recenter to") (vector (list 'control mouse-wheel-up-event)) (vector (list 'control mouse-wheel-down-event)) (vector (list 'shift mouse-wheel-up-event)) - (vector (list 'shift mouse-wheel-down-event))))) + (vector (list 'shift mouse-wheel-down-event)))) + (when (and (boundp 'mouse-wheel-up-alternate-event) (boundp 'mouse-wheel-down-alternate-event)) + (mapc (lambda (key) + (define-key ccm-map key 'ccm-mwheel-scroll)) + (list (vector mouse-wheel-up-alternate-event) + (vector mouse-wheel-down-alternate-event) + (vector (list 'control mouse-wheel-up-alternate-event)) + (vector (list 'control mouse-wheel-down-alternate-event)) + (vector (list 'shift mouse-wheel-up-alternate-event)) + (vector (list 'shift mouse-wheel-down-alternate-event)))))) (define-key ccm-map [(meta v)] 'ccm-scroll-down) (define-key ccm-map [(control v)] 'ccm-scroll-up) (define-key ccm-map [prior] 'ccm-scroll-down) @@ -238,7 +251,7 @@ to successively recenter to") "Keymap used in centered-cursor-mode.") -(defun ccm-mwheel-scroll (event) +(defun ccm-mwheel-scroll (event &optional args) "Very similar to `mwheel-scroll', but does not use `scroll-down' and `scroll-up' but `previous-line' and `next-line', that is, the cursor is moved and thus the text in the window is scrolled @@ -251,12 +264,12 @@ the same as in mwheel-scroll, scroll by a near full screen. This command exists, because mwheel-scroll caused strange behaviour with automatic recentering." ;; (interactive (list last-input-event)) - (interactive "e") + (interactive (list last-input-event current-prefix-arg)) (when (region-active-p) (deactivate-mark)) (let* ((mods (delq 'click (delq 'double (delq 'triple (event-modifiers event))))) (amt (assoc mods mouse-wheel-scroll-amount))) - ;;(message "%S" mods) + ;; (message "%S" mods) (if amt (setq amt (or (cdr amt) (- (ccm-visible-text-lines) @@ -267,10 +280,14 @@ behaviour with automatic recentering." (select-window (posn-window (event-start event)))) (let ((button (mwheel-event-button event))) (cond - ((eq button mouse-wheel-down-event) + ((or + (eq button mouse-wheel-down-event) + (and (boundp 'mouse-wheel-down-alternate-event) (eq button mouse-wheel-down-alternate-event))) (forward-line (- amt))) ;;(princ amt)) - ((eq button mouse-wheel-up-event) + ((or + (eq button mouse-wheel-up-event) + (and (boundp 'mouse-wheel-up-alternate-event) (eq button mouse-wheel-up-alternate-event))) (forward-line amt)) ;;(princ amt)) (t (error "Bad binding in ccm-mwheel-scroll")))))) -- 2.47.3