From 0e755319451dd9c6c99c2a2ef82c890ba93343b6 Mon Sep 17 00:00:00 2001 From: Alp Aker Date: Fri, 30 Oct 2015 15:33:08 -0400 Subject: [PATCH] Remove patch for v23 on OS X. --- fci-osx-23-fix.el | 58 ---------------------------------------- fill-column-indicator.el | 12 --------- 2 files changed, 70 deletions(-) delete mode 100644 fci-osx-23-fix.el diff --git a/fci-osx-23-fix.el b/fci-osx-23-fix.el deleted file mode 100644 index b1389eb..0000000 --- a/fci-osx-23-fix.el +++ /dev/null @@ -1,58 +0,0 @@ -;;; fci-osx-23-fix.el --- workaround for fci-mode on Mac OS X, v23.0-2 - -;; Copyright (c) 2011-2012 Alp Aker - -;; Author: Alp Aker -;; Version: 1.79 -;; Keywords: convenience - -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License as -;; published by the Free Software Foundation; either version 2 of the -;; License, or (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. - -;; A copy of the GNU General Public License can be obtained from the -;; Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -;; MA 02111-1307 USA - -;;; Commentary: - -;; You should only need to use this if you're using fill-column-indicator -;; with the Mac OS X (NextStep) port, versions 23.0 through 23.2. (It is -;; *not* needed with v22.) To use it, simply place this file in your load -;; path and put -;; -;; (require 'fci-osx-23-fix) -;; -;; in your .emacs. - -(require 'fill-column-indicator) - -(defvar fci-nextstep-23-hack-overlay nil) -(make-variable-buffer-local 'fci-nextstep-23-hack-overlay) - -(defun fci-nextstep-23-hack () - (when fci-nextstep-23-hack-overlay - (overlay-put fci-nextstep-23-hack-overlay - 'after-string - (overlay-get fci-nextstep-23-hack-overlay 'fci-after-string)) - (setq fci-nextstep-23-hack-overlay nil)) - (when (and (not fci-newline) - (= (current-column) fci-limit) - (setq fci-nextstep-23-hack-overlay (fci-overlay-at-point))) - (overlay-put fci-nextstep-23-hack-overlay 'fci-after-string - (overlay-get fci-nextstep-23-hack-overlay 'after-string)) - (overlay-put fci-nextstep-23-hack-overlay 'after-string nil))) - -(defun fci-overlay-at-point () - (car (fci-get-overlays-region (point) (point)))) - -(add-to-list 'fci-hook-assignments - '(post-command-hook fci-nextstep-23-hack 'local)) - -(provide 'fci-osx-23-fix) diff --git a/fill-column-indicator.el b/fill-column-indicator.el index f644ae7..cbe20d4 100644 --- a/fill-column-indicator.el +++ b/fill-column-indicator.el @@ -153,18 +153,6 @@ ;; support this use case, but thus far there seems to be no demand for ;; it.) -;; o An issue specific to the Mac OS X (NextStep) port, versions 23.0-23.2: -;; Emacs won't, in these particular versions, draw a cursor on top of an -;; image. Thus on graphical displays the cursor will disappear when -;; positioned directly on top of the fill-column rule. The best way to -;; deal with this is to upgrade to v23.3 or v24 (or downgrade to v22). If -;; that isn't practical, a fix is available via the mini-package -;; fci-osx-23-fix.el, which can be downloaded from: -;; -;; github.com/alpaker/Fill-Column-Indicator -;; -;; Directions for its use are given in the file header. - ;; Todo ;; ====