X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-filter.el;h=1249dd71253285f35a9f6673dad2ee0fd77c558d;hb=dd46307e6ec5ca9595963dc5d42aa109b8d3af0e;hp=44b5edafbe9f663567090cd74a752bcaacf4b41b;hpb=a05f503e01d1ed85ca8d9cf43c53221f86d7f375;p=elisp%2Friece.git diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el index 44b5eda..1249dd7 100644 --- a/lisp/riece-filter.el +++ b/lisp/riece-filter.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. ;;; Code: @@ -76,31 +76,39 @@ (set-buffer (process-buffer process)) (goto-char (point-max)) (insert input) - (goto-char riece-read-point) - (beginning-of-line) - (while (looking-at ".*\n") ;the input line is finished - (save-excursion - (if (looking-at - ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)") - (riece-handle-numeric-reply - (match-string 1) ;prefix - (string-to-number (match-string 2)) ;number - (match-string 3) ;name - (riece-chomp-string (match-string 4))) ;reply string - (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)") - (riece-handle-message - (match-string 2) ;optional prefix - (match-string 3) ;command - (riece-chomp-string (match-string 4))) ;params & trailing - (if riece-debug - (message "Weird message from server: %s" - (buffer-substring (point) (progn - (end-of-line) - (point)))))))) - (forward-line)) - (unless riece-debug - (delete-region (point-min) (point))) - (setq riece-read-point (point)))) + (unless riece-filter-running + (unwind-protect + (progn + (setq riece-filter-running t) + (goto-char riece-read-point) + (beginning-of-line) + (while (looking-at ".*\n") ;the input line is finished + (save-excursion + (if (looking-at + ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\)\ + +\\(.*\\)") + (riece-handle-numeric-reply + (match-string 1) ;prefix + (string-to-number (match-string 2)) ;number + (match-string 3) ;name + (riece-chomp-string (match-string 4))) ;reply string + (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)") + (riece-handle-message + (match-string 2) ;optional prefix + (match-string 3) ;command + (riece-chomp-string (match-string 4)) + ;params & trailing + ) + (if riece-debug + (message "Weird message from server: %s" + (buffer-substring (point) (progn + (end-of-line) + (point)))))))) + (forward-line)) + (unless riece-debug + (delete-region (point-min) (point))) + (setq riece-read-point (point))) + (setq riece-filter-running nil))))) (eval-when-compile (autoload 'riece-exit "riece"))