From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.bugs Subject: bug#19566: (unload-feature 'misearch) breaks isearch Date: Sun, 11 Jan 2015 11:37:57 +0000 Message-ID: <87y4p9y2cq.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1420976359 1905 80.91.229.3 (11 Jan 2015 11:39:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 11 Jan 2015 11:39:19 +0000 (UTC) To: 19566@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jan 11 12:39:14 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1YAGrQ-0006bu-OI for geb-bug-gnu-emacs@m.gmane.org; Sun, 11 Jan 2015 12:39:12 +0100 Original-Received: from localhost ([::1]:58015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAGrQ-0003vK-6S for geb-bug-gnu-emacs@m.gmane.org; Sun, 11 Jan 2015 06:39:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAGrM-0003v5-2r for bug-gnu-emacs@gnu.org; Sun, 11 Jan 2015 06:39:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YAGrI-0006s5-Pn for bug-gnu-emacs@gnu.org; Sun, 11 Jan 2015 06:39:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33045) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAGrH-0006rQ-K2 for bug-gnu-emacs@gnu.org; Sun, 11 Jan 2015 06:39:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YAGrG-0007JA-R9 for bug-gnu-emacs@gnu.org; Sun, 11 Jan 2015 06:39:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 11 Jan 2015 11:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19566 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: submit@debbugs.gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.142097629428021 (code B ref -1); Sun, 11 Jan 2015 11:39:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 Jan 2015 11:38:14 +0000 Original-Received: from localhost ([127.0.0.1]:42411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YAGqT-0007Hs-7C for submit@debbugs.gnu.org; Sun, 11 Jan 2015 06:38:13 -0500 Original-Received: from fely.am-1.org ([78.47.74.50]:48880) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YAGqP-0007Hf-Ip for submit@debbugs.gnu.org; Sun, 11 Jan 2015 06:38:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:Date:Sender:Subject:To:From; bh=ahjmLOeeG0N8tSJ9sVHH/FFWTuksvsmox5jt751GMHE=; b=nqrqxWH4398qKVP+mgCbwlj+yNteDcLsihzKWHljaiJ3E0mEDi+Ta2MF1Ri5l0Zds9J1EEn/h3TiVK54wDf6pJGE1mJZ/KR7YS0kgRYwdZwYIFu4I5xVZG4vo4XSFVdMOXmmmU8ygjA1L+yoIo++v/N+rCtmJl32odFFPQRkBzc=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YAGqL-0003KQ-Tj for submit@debbugs.gnu.org; Sun, 11 Jan 2015 11:38:06 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YAGqE-0005GZ-Ih for submit@debbugs.gnu.org; Sun, 11 Jan 2015 18:37:58 +0700 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:98223 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Package: emacs Severity: minor Tags: patch Using unload-feature to unload misearch.el also undefines the autoloaded variables, which breaks isearch.el as it still uses them. Please thus consider the patch MIMEd. * lisp/misearch.el (multi-isearch-unload-function): New function to retain definitions of autoloaded variables when unloading. (misearch-unload-function): New alias. --=20 FSF associate member #7257 np. The Middle Path =E2=80=94 David Modica B6A0= 230E 334A --=-=-= Content-Type: text/diff Content-Disposition: inline --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -377,6 +377,25 @@ (goto-char (if isearch-forward (point-min) (point-max))) (isearch-forward-regexp nil t))) +(defun multi-isearch-unload-function () + "Remove autoloaded variables from `unload-function-defs-list'. +Also prevent the feature from being reloaded via `isearch-mode-hook'." + (remove-hook 'isearch-mode-hook 'multi-isearch-setup) + (let ((defs (list (car unload-function-defs-list))) + (auto '(multi-isearch-next-buffer-function + multi-isearch-next-buffer-current-function + multi-isearch-current-buffer + multi-isearch-buffer-list multi-isearch-file-list))) + (dolist (def (cdr unload-function-defs-list)) + (unless (and (symbolp def) + (memq def auto)) + (push def defs))) + (setq unload-function-defs-list (nreverse defs)) + ;; . + nil)) + +(defalias 'misearch-unload-function 'multi-isearch-unload-function) + (provide 'multi-isearch) (provide 'misearch) --=-=-=--