From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] /srv/bzr/emacs/trunk r112104: * progmodes/cfengine.el (cfengine-common-syntax): Add "_" to word syntax. Date: Tue, 26 Mar 2013 05:17:39 -0400 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87r4j2v7t8.fsf@lifelogs.com> References: <87wqt0xqiy.fsf@lifelogs.com> <87sj3ny4ca.fsf@lifelogs.com> <87ehf7zid3.fsf@fleche.redhat.com> <87obeby2ph.fsf@lifelogs.com> <878v5fxzjg.fsf@lifelogs.com> <871ub7xn7e.fsf@lifelogs.com> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1364289479 19431 80.91.229.3 (26 Mar 2013 09:17:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Mar 2013 09:17:59 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 26 10:18:26 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UKQ1S-00056u-Bt for ged-emacs-devel@m.gmane.org; Tue, 26 Mar 2013 10:18:26 +0100 Original-Received: from localhost ([::1]:56944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQ14-00006N-71 for ged-emacs-devel@m.gmane.org; Tue, 26 Mar 2013 05:18:02 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:39797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQ0z-00005y-4V for emacs-devel@gnu.org; Tue, 26 Mar 2013 05:17:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKQ0t-0005Mx-TD for emacs-devel@gnu.org; Tue, 26 Mar 2013 05:17:57 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:33697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQ0t-0005Ml-IT for emacs-devel@gnu.org; Tue, 26 Mar 2013 05:17:51 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1UKQ1E-0004kr-Hu for emacs-devel@gnu.org; Tue, 26 Mar 2013 10:18:12 +0100 Original-Received: from pool-72-93-31-86.bstnma.east.verizon.net ([72.93.31.86]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Mar 2013 10:18:12 +0100 Original-Received: from tzz by pool-72-93-31-86.bstnma.east.verizon.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Mar 2013 10:18:12 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 163 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pool-72-93-31-86.bstnma.east.verizon.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:AnlzS+/NtGw38qfAWnCUApH2ifc= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:158194 Archived-At: --=-=-= Content-Type: text/plain On Sat, 23 Mar 2013 12:01:31 -0400 Stefan Monnier wrote: >>>> Yes! In particular, context expressions in CFEngine are things like >>>> "a_b_c.d_e" and it's a pain to skip over them with the usual `M-f' or >>>> CUA keybindings. SM> I use C-M-f, C-M-b, C-M-t for that. >> Right. Well, do you want me to work on the symbol-word minor mode or >> will you? It seems like a pretty useful change. SM> I do not plan to work on it, so please go ahead. You might want to SM> start from subword.el which makes a similar change, tho in a different SM> direction (making words smaller rather than larger). The below simply adds a buffer-local `subword-superiority' defcustom which, when set, makes `subword-mode' treat symbol_words as a single word. I named it to reflect the opposite behavior (the opposite of "sub" is usually "super", e.g. subscript vs. superscript). Let me know what you think and if you'd rather see a separate mode or even a separate file instead. IMO it's such a simple change that I'd rather not make it a big deal. The only possible enhancement I'd want over the attached is to also make `subword-mode' override the CUA keyboard shortcuts (C-left, C-right), but I wasn't sure if that's OK in general. Ted --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=subword-superiority.patch === modified file 'lisp/progmodes/subword.el' --- lisp/progmodes/subword.el 2013-01-01 09:11:05 +0000 +++ lisp/progmodes/subword.el 2013-03-26 09:11:57 +0000 @@ -43,7 +43,9 @@ ;; The subword oriented commands defined in this package recognize ;; subwords in a nomenclature to move between them and to edit them as -;; words. +;; words. You can customize `subword-superiority' to make the mode +;; treat symbols as words instead, creating a sort of "superword-mode" +;; (but not explicitly). ;; In the minor mode, all common key bindings for word oriented ;; commands are overridden by the subword oriented commands: @@ -71,6 +73,13 @@ ;; (lambda () (subword-mode 1))) ;; +;; To make the mode turn `subword-superiority' on automatically for +;; only some modes, put the following code in your .emacs: +;; +;; (add-hook 'c-mode-common-hook +;; (lambda () (subword-mode 1) (setq subword-superiority t))) +;; + ;; Acknowledgment: ;; The regular expressions to detect subwords are mostly based on ;; the old `c-forward-into-nomenclature' originally contributed by @@ -80,6 +89,14 @@ ;;; Code: +(defcustom subword-superiority nil + "Whether `subword-mode' should move inside SubWords or treat symbols as words. +Becomes buffer-local when set." + :group 'editing + :type '(choice (const :tag "Treat SubWords as two words" nil) + (const :tag "Treat symbol_words as a single word" t))) +(make-variable-buffer-local 'subword-superiority) + (defvar subword-forward-function 'subword-forward-internal "Function to call for forward subword movement.") @@ -128,6 +145,9 @@ EmacsFrameClass => \"Emacs\", \"Frame\" and \"Class\" NSGraphicsContext => \"NS\", \"Graphics\" and \"Context\" +When `subword-superiority' is set to t, `subword-mode' treats +symbol_words as single words instead. + The subword oriented commands activated in this minor mode recognize subwords in a nomenclature to move between subwords and to edit them as words. @@ -143,6 +163,9 @@ (define-global-minor-mode global-subword-mode subword-mode (lambda () (subword-mode 1))) +(define-global-minor-mode global-superword-mode subword-mode + (lambda () (subword-mode 1) (setq subword-superiority t))) + (defun subword-forward (&optional arg) "Do the same as `forward-word' but on subwords. See the command `subword-mode' for a description of subwords. @@ -260,33 +283,37 @@ ;; Internal functions ;; (defun subword-forward-internal () - (if (and - (save-excursion - (let ((case-fold-search nil)) - (re-search-forward subword-forward-regexp nil t))) - (> (match-end 0) (point))) - (goto-char - (cond - ((< 1 (- (match-end 2) (match-beginning 2))) - (1- (match-end 2))) - (t - (match-end 0)))) - (forward-word 1))) + (if subword-superiority + (forward-symbol 1) + (if (and + (save-excursion + (let ((case-fold-search nil)) + (re-search-forward subword-forward-regexp nil t))) + (> (match-end 0) (point))) + (goto-char + (cond + ((< 1 (- (match-end 2) (match-beginning 2))) + (1- (match-end 2))) + (t + (match-end 0)))) + (forward-word 1)))) (defun subword-backward-internal () - (if (save-excursion - (let ((case-fold-search nil)) - (re-search-backward subword-backward-regexp nil t))) - (goto-char - (cond - ((and (match-end 3) - (< 1 (- (match-end 3) (match-beginning 3))) - (not (eq (point) (match-end 3)))) - (1- (match-end 3))) - (t - (1+ (match-beginning 0))))) - (backward-word 1))) + (if subword-superiority + (forward-symbol -1) + (if (save-excursion + (let ((case-fold-search nil)) + (re-search-backward subword-backward-regexp nil t))) + (goto-char + (cond + ((and (match-end 3) + (< 1 (- (match-end 3) (match-beginning 3))) + (not (eq (point) (match-end 3)))) + (1- (match-end 3))) + (t + (1+ (match-beginning 0))))) + (backward-word 1)))) (provide 'subword) --=-=-=--